diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-06-18 11:16:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-18 11:16:54 -0700 |
| commit | 8642abc76454a6e09344e27a7797ff08264abe76 (patch) | |
| tree | dcdc99515cb5e53795b7777b85b8030fd1f9fbb4 /builtin/merge-tree.c | |
| parent | Merge branch 'ph/clone-message-reword' (diff) | |
| parent | merge: --log appends shortlog to message if specified (diff) | |
| download | tgif-8642abc76454a6e09344e27a7797ff08264abe76.tar.xz | |
Merge branch 'tc/merge-m-log'
* tc/merge-m-log:
merge: --log appends shortlog to message if specified
fmt-merge-msg: add function to append shortlog only
fmt-merge-msg: refactor merge title formatting
fmt-merge-msg: minor refactor of fmt_merge_msg()
merge: rename variable
merge: update comment
t7604-merge-custom-message: show that --log doesn't append to -m
t7604-merge-custom-message: shift expected output creation
Conflicts:
builtin.h
Diffstat (limited to 'builtin/merge-tree.c')
0 files changed, 0 insertions, 0 deletions