diff options
| author |  Charles Bailey <charles@hashpling.org> | 2008-11-13 12:41:14 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-11-14 21:30:55 -0800 |
| commit | 682b451f84c046aa5b082e89e3db62950cb6261a (patch) | |
| tree | fd7864b1814217518df587acfcdbc3c92d4f9d67 /git-mergetool.sh | |
| parent | Fix some tab/space inconsistencies in git-mergetool.sh (diff) | |
| download | tgif-682b451f84c046aa5b082e89e3db62950cb6261a.tar.xz | |
Add -y/--no-prompt option to mergetool
This option lets git mergetool invoke the conflict resolution program
without waiting for a user prompt each time.
Also added a mergetool.prompt (default true) configuration variable
controlling the same behaviour
Signed-off-by: Charles Bailey <charles@hashpling.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool.sh')
| -rwxr-xr-x | git-mergetool.sh | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/git-mergetool.sh b/git-mergetool.sh index e2da5fc546..507028f859 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -8,7 +8,7 @@ # at the discretion of Junio C Hamano. # -USAGE='[--tool=tool] [file to merge] ...' +USAGE='[--tool=tool] [-y|--no-prompt|--prompt] [file to merge] ...' SUBDIRECTORY_OK=Yes OPTIONS_SPEC= . git-sh-setup @@ -176,8 +176,10 @@ merge_file () { echo "Normal merge conflict for '$MERGED':" describe_file "$local_mode" "local" "$LOCAL" describe_file "$remote_mode" "remote" "$REMOTE" - printf "Hit return to start merge resolution tool (%s): " "$merge_tool" - read ans + if "$prompt" = true; then + printf "Hit return to start merge resolution tool (%s): " "$merge_tool" + read ans + fi case "$merge_tool" in kdiff3) @@ -280,6 +282,8 @@ merge_file () { cleanup_temp_files } +prompt=$(git config --bool mergetool.prompt || echo true) + while test $# != 0 do case "$1" in @@ -295,6 +299,12 @@ do shift ;; esac ;; + -y|--no-prompt) + prompt=false + ;; + --prompt) + prompt=true + ;; --) break ;; |