diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-06-06 11:35:01 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-06-06 11:35:02 -0700 |
commit | e7cc0ede1837b6f679e245e29ae3687fc5e6c20d (patch) | |
tree | f20fa96fad6afd13fd97cd895bdbc7e173a3c29e /convert.c | |
parent | Merge branch 'sk/spawn-less-case-insensitively-from-grep-O-i' (diff) | |
parent | git-show: fix 'git show -s' to not add extra terminator after merge commit (diff) | |
download | tgif-e7cc0ede1837b6f679e245e29ae3687fc5e6c20d.tar.xz |
Merge branch 'mk/show-s-no-extra-blank-line-for-merges'
* mk/show-s-no-extra-blank-line-for-merges:
git-show: fix 'git show -s' to not add extra terminator after merge commit
Diffstat (limited to 'convert.c')
0 files changed, 0 insertions, 0 deletions