git/git-mergetool.sh, branch v2.20.2

mergetool: accept -g/--[no-]gui as arguments

2018-10-25T05:01:10Z

In line with how difftool accepts a -g/--[no-]gui option, make mergetool accept the same option in order to use the `merge.guitool` variable to find the default mergetool instead of `merge.tool`. Signed-off-by: Denton Liu Signed-off-by: Anmol Mago Signed-off-by: Brian Ho Signed-off-by: David Lu Signed-off-by: Ryan Wang Acked-by: David Aguilar Signed-off-by: Junio C Hamano

mergetool: don't suggest to continue after last file

2018-08-13T19:11:19Z

Eliminate an unnecessary prompt to continue after failed merger, by not calling the prompt_after_failed_merge function when only one iteration remains. Uses positional parameters to count files in the list to make it easier to see if we have any more paths to process from within the loop. Signed-off-by: Nicholas Guriev Signed-off-by: Junio C Hamano

mergetool: fix running in subdir when rerere enabled

2017-01-10T21:22:51Z

"git mergetool" (without any pathspec on the command line) that is not run from the top-level of the working tree no longer works in Git v2.11, failing to get the list of unmerged paths from the output of "git rerere remaining". This regression was introduced by 57937f70a0 ("mergetool: honor diff.orderFile", 2016-10-07). This is because the pathnames output by the 'git rerere remaining' command are relative to the top-level directory but the 'git diff --name-only' command expects its pathname arguments to be relative to the current working directory. To make everything consistent, cd_to_toplevel before running 'git diff --name-only' and adjust any relative pathnames. Signed-off-by: Richard Hansen Signed-off-by: Junio C Hamano

mergetool: take the "-O" out of $orderfile

2017-01-10T21:22:20Z

This will make it easier for a future commit to convert a relative orderfile pathname to either absolute or relative to the top-level directory. It also improves code readability. Signed-off-by: Richard Hansen Signed-off-by: Junio C Hamano

mergetool: honor -O

2016-10-11T17:04:31Z

Teach mergetool to pass "-O" down to `git diff` when specified on the command-line. Helped-by: Johannes Sixt Signed-off-by: David Aguilar Reviewed-by: Johannes Sixt Signed-off-by: Junio C Hamano

mergetool: honor diff.orderFile

2016-10-11T17:04:27Z

Teach mergetool to get the list of files to edit via `diff` so that we gain support for diff.orderFile. Suggested-by: Luis Gutierrez Helped-by: Johannes Sixt Signed-off-by: David Aguilar Reviewed-by: Johannes Sixt Signed-off-by: Junio C Hamano

mergetool: move main program flow into a main() function

2016-10-11T17:04:23Z

Make it easier to follow the program's flow by isolating all logic into functions. Isolate the main execution code path into a single unit instead of having prompt_after_failed_merge() interrupt it partyway through. The use of a main() function is borrowing a convention from C, Python, Perl, and many other languages. This helps readers more familiar with other languages understand the purpose of each function when diving into the codebase with fresh eyes. Signed-off-by: David Aguilar Reviewed-by: Johannes Sixt Signed-off-by: Junio C Hamano

mergetool: add copyright

2016-10-11T17:04:10Z

Signed-off-by: David Aguilar Reviewed-by: Johannes Sixt Signed-off-by: Junio C Hamano

Merge branch 'nf/mergetool-prompt'

2016-05-03T21:08:17Z

UI consistency improvements. * nf/mergetool-prompt: difftool/mergetool: make the form of yes/no questions consistent

difftool/mergetool: make the form of yes/no questions consistent

2016-04-25T22:15:17Z

Every yes/no question in difftool/mergetool scripts has slightly different form, and none of them is consistent with the form git itself uses. Make the form of all the questions consistent with the form used by git. Reviewed-by: John Keeping Signed-off-by: Nikola Forró Acked-by: David Aguilar Signed-off-by: Junio C Hamano