]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d5b99f3 f972a16)
Merge branch 'jk/mailmap-incomplete-line' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Sep 2013 18:57:32 +0000 (11:57 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Sep 2013 18:57:33 +0000 (11:57 -0700)
* jk/mailmap-incomplete-line:
  mailmap: handle mailmap blobs without trailing newlines

1  2 
mailmap.c patch | diff1 | diff2 | blob | history
t/t4203-mailmap.sh patch | diff1 | diff2 | blob | history

diff --cc mailmap.c
Simple merge
diff --cc t/t4203-mailmap.sh
Simple merge
Unnamed repository; edit this file 'description' to name the repository.