]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cb4d6c2 46ec510)
Merge branch 'cb/log-follow-with-combined'
authorJunio C Hamano <gitster@pobox.com>
Tue, 11 Jun 2013 20:30:36 +0000 (13:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Jun 2013 20:30:36 +0000 (13:30 -0700)
* cb/log-follow-with-combined:
  fix segfault with git log -c --follow

1  2 
combine-diff.c patch | diff1 | diff2 | blob | history
t/t4202-log.sh patch | diff1 | diff2 | blob | history

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