diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-02-19 21:18:17 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-02-19 21:18:17 -0800 |
| commit | 73be17f0b387b2741646498a9a80da677a9e0c7a (patch) | |
| tree | e5d845a0d0da8926a8370987b44ebb34f690c6f0 /git-merge.sh | |
| parent | Merge branch 'jc/mv' (diff) | |
| parent | fmt-merge-msg: do not add excess newline at the end. (diff) | |
| download | tgif-73be17f0b387b2741646498a9a80da677a9e0c7a.tar.xz | |
Merge branch 'jc/merge-msg'
* jc/merge-msg:
fmt-merge-msg: do not add excess newline at the end.
fmt-merge-msg: say which branch things were merged into unless 'master'
Diffstat (limited to 'git-merge.sh')
0 files changed, 0 insertions, 0 deletions