projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b4bd6bb e5e9b56)
Merge branch 'rs/combine-diff-zero-context-at-the-beginning' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 26 Apr 2012 17:35:25 +0000 (10:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 26 Apr 2012 17:35:26 +0000 (10:35 -0700)
commit10a20b43c3d03ea1fab9095f96eda66086d3dcd2
tree79461cf56448cbf12a214fb69ed1e566f0b4bf49tree | snapshot
parentb4bd6bb356795ef817d44d65c16bba7f192ab29ecommit | diff
parente5e9b56528294e9455d22d1abb21ad32f098a1becommit | diff
Merge branch 'rs/combine-diff-zero-context-at-the-beginning' into maint

An age-old corner case bug in combine diff (only triggered with -U0
and the hunk at the beginning of the file needs to be shown) has been
fixed.

By René Scharfe
* rs/combine-diff-zero-context-at-the-beginning:
  combine-diff: fix loop index underflow
combine-diff.c diff1 | diff2 | blob | history
Git—the stupid content tracker