![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 29 Sep 2010 20:48:20 +0000 (13:48 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 29 Sep 2010 20:48:20 +0000 (13:48 -0700) | ||
| commit | 02ef0ed7102a197e2b746f3e694c09915fa98060 | |
| tree | 3e703ac528c01b7c964a0022185e14071cfb1c40 | tree | snapshot |
| parent | 2851e8eba52e98d3112417952a24d82ae9d8c0eb | commit | diff |
| parent | bd2549ca6b0b2d897e073bbaa34c1fee46acd8f0 | commit | diff |
Merge branch 'rr/fmt-merge-msg'
* rr/fmt-merge-msg:
t6200-fmt-merge-msg: Exercise '--log' to configure shortlog length
t6200-fmt-merge-msg: Exercise 'merge.log' to configure shortlog length
merge: Make 'merge.log' an integer or boolean option
merge: Make '--log' an integer option for number of shortlog entries
fmt_merge_msg: Change fmt_merge_msg API to accept shortlog_len
Conflicts:
builtin/merge.c
* rr/fmt-merge-msg:
t6200-fmt-merge-msg: Exercise '--log' to configure shortlog length
t6200-fmt-merge-msg: Exercise 'merge.log' to configure shortlog length
merge: Make 'merge.log' an integer or boolean option
merge: Make '--log' an integer option for number of shortlog entries
fmt_merge_msg: Change fmt_merge_msg API to accept shortlog_len
Conflicts:
builtin/merge.c
| Documentation/merge-config.txt | diff1 | | diff2 | | blob | history |
| builtin.h | diff1 | | diff2 | | blob | history |
| builtin/fmt-merge-msg.c | diff1 | | diff2 | | blob | history |
| builtin/merge.c | diff1 | | diff2 | | blob | history |