]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8b026ed cb427e9)
Merge branch 'svn/authors-prog-2' of git://bogomips.org/git-svn
authorJunio C Hamano <gitster@pobox.com>
Wed, 11 Apr 2018 23:05:28 +0000 (08:05 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 Apr 2018 23:05:28 +0000 (08:05 +0900)
* 'svn/authors-prog-2' of git://bogomips.org/git-svn:
  git-svn: allow empty email-address using authors-prog and authors-file
  git-svn: search --authors-prog in PATH too

1  2 
t/t9130-git-svn-authors-file.sh patch | diff1 | diff2 | blob | history
t/t9138-git-svn-authors-prog.sh patch | diff1 | diff2 | blob | history

diff --cc t/t9130-git-svn-authors-file.sh
Simple merge
diff --cc t/t9138-git-svn-authors-prog.sh
Simple merge
Unnamed repository; edit this file 'description' to name the repository.