Skip to content
/ git Public
forked from git/git

Commit

Permalink
doc: describe mergetool configuration in git-mergetool(1)
Browse files Browse the repository at this point in the history
In particular, this describes mergetool.hideResolved, which can help
users discover this setting (either because it may be useful to them
or in order to understand mergetool's behavior if they have forgotten
setting it in the past).

Tested by running

	make -C Documentation git-mergetool.1
	man Documentation/git-mergetool.1

and reading through the page.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
jrn authored and gitster committed Mar 13, 2021
1 parent b2a51c1 commit 5320406
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions Documentation/git-mergetool.txt
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,10 @@ success of the resolution after the custom tool has exited.
(see linkgit:git-config[1]). To cancel `diff.orderFile`,
use `-O/dev/null`.

CONFIGURATION
-------------
include::config/mergetool.txt[]

TEMPORARY FILES
---------------
`git mergetool` creates `*.orig` backup files while resolving merges.
Expand Down

0 comments on commit 5320406

Please sign in to comment.