summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-02-11 18:32:37 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-02-11 18:32:37 -0800
commit7a134dbbc9ca7013c09b610351c5ce45dc10cda5 (patch)
tree911f77ae0affc4845c8a3fe5dc346b9f764e1bbe /git-mergetool.sh
parentMerge branch 'maint-1.5.6' into maint (diff)
parentMake repack less likely to corrupt repository (diff)
downloadtgif-7a134dbbc9ca7013c09b610351c5ce45dc10cda5.tar.xz
Merge branch 'maint-1.6.0' into maint
* maint-1.6.0: Make repack less likely to corrupt repository fast-export: ensure we traverse commits in topological order Clear the delta base cache if a pack is rebuilt
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions