projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8bcff62 c86fbe5)
Merge branch 'jc/maint-combine-diff-pre-context'
authorJunio C Hamano <gitster@pobox.com>
Sun, 22 Jun 2008 21:33:56 +0000 (14:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 22 Jun 2008 21:33:56 +0000 (14:33 -0700)
* jc/maint-combine-diff-pre-context:
  diff -c/--cc: do not include uninteresting deletion before leading context

1  2 
combine-diff.c patch | diff1 | diff2 | blob | history

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