| commit | d1cc4621eda62222fbc929a7f65c89b6be678c2e | |
| author | David Aguilar <davvid@gmail.com> | |
| Sun, 18 Jul 2010 01:46:48 +0000 (17 18:46 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 19 Jul 2010 16:16:09 +0000 (19 09:16 -0700) | ||
| tree | 59bb12689639adc5d3b15b0c12ad39dd0d3ad7d7 | treesnapshot (tar.gz zip) |
| parent | 0ad0a61f05fe521a63ade9bfafd2f589fba0df33 | commitdiff |
Documentation: Explain git-mergetool's use of temporary files
'git mergetool' creates '*.orig' backup files in its
default configuration. Mention this in its documentation.
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
'git mergetool' creates '*.orig' backup files in its
default configuration. Mention this in its documentation.
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/git-mergetool.txt | diffblobblamehistory |