projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d8ce800 f633ea2)
Merge branch 'tr/merge-recursive-flush' into maint-1.7.11
authorJunio C Hamano <gitster@pobox.com>
Tue, 11 Sep 2012 17:53:31 +0000 (10:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Sep 2012 17:53:31 +0000 (10:53 -0700)
* tr/merge-recursive-flush:
  merge-recursive: eliminate flush_buffer() in favor of write_in_full()

1  2 
merge-recursive.c patch | diff1 | diff2 | blob | history

diff --cc merge-recursive.c
Simple merge
Git—the stupid content tracker