summaryrefslogtreecommitdiff
path: root/Documentation/howto/revert-a-faulty-merge.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-03-24 15:31:15 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-03-24 15:31:15 -0700
commit2a5643da732b70004920f75efa1ebdc2a6ed1689 (patch)
tree145937f2d3fb693771715732cd9f7d34e8941f60 /Documentation/howto/revert-a-faulty-merge.txt
parentMerge branch 'maint-1.6.0' into maint-1.6.1 (diff)
parentclose_sha1_file(): make it easier to diagnose errors (diff)
downloadtgif-2a5643da732b70004920f75efa1ebdc2a6ed1689.tar.xz
Merge branch 'maint-1.6.0' into maint-1.6.1
* maint-1.6.0: close_sha1_file(): make it easier to diagnose errors avoid possible overflow in delta size filtering computation
Diffstat (limited to 'Documentation/howto/revert-a-faulty-merge.txt')
0 files changed, 0 insertions, 0 deletions