![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sat, 3 May 2008 20:18:20 +0000 (13:18 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 3 May 2008 20:18:20 +0000 (13:18 -0700) |
* commit 'sg/merge-options^':
merge, pull: add '--(no-)log' command line option
fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variable
add 'merge.stat' config variable
merge, pull: introduce '--(no-)stat' option
doc: moved merge.* config variables into separate merge-config.txt
merge, pull: add '--(no-)log' command line option
fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variable
add 'merge.stat' config variable
merge, pull: introduce '--(no-)stat' option
doc: moved merge.* config variables into separate merge-config.txt
| 1 | 2 | |||
|---|---|---|---|---|
| Documentation/config.txt | patch | | diff1 | | diff2 | | blob | history |
| builtin-fmt-merge-msg.c | patch | | diff1 | | diff2 | | blob | history |
| contrib/completion/git-completion.bash | patch | | diff1 | | diff2 | | blob | history |
diff --cc Documentation/config.txt
Simple merge
diff --cc builtin-fmt-merge-msg.c
Simple merge
diff --cc contrib/completion/git-completion.bash
Simple merge