| commit | 958ca95f11203ec8b52b11040e1f21f02dc7863b | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 22 Sep 2010 16:35:58 +0000 (22 09:35 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 22 Sep 2010 16:35:58 +0000 (22 09:35 -0700) | ||
| tree | 70ca6884b48bc70ed0801d5631f1aae503ef21b3 | treesnapshot (tar.gz zip) |
| parent | 1105f6233b6ec8631cee1aa32810185ae0bb614b | commitdiff |
| parent | bd2549ca6b0b2d897e073bbaa34c1fee46acd8f0 | commitdiff |
Merge branch 'rr/fmt-merge-msg' into next
* 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 | blobhistory |
| builtin.h | diff1 | diff2 | blobhistory |
| builtin/fmt-merge-msg.c | diff1 | diff2 | blobhistory |
| builtin/merge.c | diff1 | diff2 | blobhistory |