| commit | 3e6c0a3fe3dcdbe6621b122a8a498a0d8627b425 | |
| author | SZEDER Gábor <szeder@ira.uka.de> | |
| Sun, 6 Apr 2008 01:23:44 +0000 (6 03:23 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 13 Apr 2008 02:28:18 +0000 (12 19:28 -0700) | ||
| tree | e09b26d17a873a63d94e7088dff143a0af14d574 | treesnapshot (tar.gz zip) |
| parent | d8abe148bece83f6c3e5ebe6075aef236322ed74 | commitdiff |
add 'merge.stat' config variable
This variable has the same effect, as 'merge.diffstat'.
Also mention it in the documentation.
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This variable has the same effect, as 'merge.diffstat'.
Also mention it in the documentation.
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/merge-config.txt | diffblobblamehistory | |
| Documentation/merge-options.txt | diffblobblamehistory | |
| git-merge.sh | diffblobblamehistory |