diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-09-29 13:48:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-29 13:48:20 -0700 |
| commit | 02ef0ed7102a197e2b746f3e694c09915fa98060 (patch) | |
| tree | 3e703ac528c01b7c964a0022185e14071cfb1c40 /git-gui/.gitattributes | |
| parent | Merge branch 'po/etc-gitattributes' (diff) | |
| parent | t6200-fmt-merge-msg: Exercise '--log' to configure shortlog length (diff) | |
| download | tgif-02ef0ed7102a197e2b746f3e694c09915fa98060.tar.xz | |
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
Diffstat (limited to 'git-gui/.gitattributes')
0 files changed, 0 insertions, 0 deletions