diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-12-27 14:25:14 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-12-27 14:25:14 -0800 |
commit | 159c88e5ae95c5b02298193c1658fac5919c8012 (patch) | |
tree | 766bead8dd95169b455c4b3fdc6afaa73e40637b /xdiff | |
parent | 78f8fbc9d641096eef495dd877de3438d8a000e0 (diff) | |
parent | a9012e343eee2404a54abcc5bbff9e63f5683029 (diff) | |
download | git-159c88e5ae95c5b02298193c1658fac5919c8012.tar.gz |
Merge branch 'maint'
* maint:
git-send-email.txt: move --format-patch paragraph to a proper location
git-shortlog.txt: improve documentation about .mailmap files
pretty: support multiline subjects with format:
pretty: factor out format_subject()
pretty: factor out skip_empty_lines()
merge-file: handle freopen() failure
daemon: cleanup: factor out xstrdup_tolower()
daemon: cleanup: replace loop with if
daemon: handle freopen() failure
describe: Avoid unnecessary warning when using --all
Diffstat (limited to 'xdiff')
0 files changed, 0 insertions, 0 deletions