projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d2559f7 1736793)
Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Tue, 28 Dec 2010 21:50:11 +0000 (13:50 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 28 Dec 2010 21:50:11 +0000 (13:50 -0800)
* maint:
  Prepare for 1.7.3.5
  Fix false positives in t3404 due to SHELL=/bin/false
  close file on error in read_mmfile()

Conflicts:
RelNotes

1  2 
t/t3404-rebase-interactive.sh patch | diff1 | diff2 | blob | history

diff --cc t/t3404-rebase-interactive.sh
Simple merge
Git—the stupid content tracker