summaryrefslogtreecommitdiff
path: root/Documentation/git-branch.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-04-16 12:41:59 -0700
committerJunio C Hamano <gitster@pobox.com>2012-04-16 12:41:59 -0700
commitf84e8b6069e87230bf4d13f845748c58d599c572 (patch)
tree190d1b3634b1830fb24ed9f44cc7cd9c2ba460ab /Documentation/git-branch.txt
parentc0599f6993413360d8e35679a6b421d4eb16a698 (diff)
parente5e9b56528294e9455d22d1abb21ad32f098a1be (diff)
downloadgit-f84e8b6069e87230bf4d13f845748c58d599c572.tar.gz
Merge branch 'rs/combine-diff-zero-context-at-the-beginning'
Fixes 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). By René Scharfe * rs/combine-diff-zero-context-at-the-beginning: combine-diff: fix loop index underflow
Diffstat (limited to 'Documentation/git-branch.txt')
0 files changed, 0 insertions, 0 deletions