aboutsummaryrefslogtreecommitdiff
path: root/merge-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-09-13 13:00:02 -0700
committerJunio C Hamano <junkio@cox.net>2006-09-13 13:00:02 -0700
commit1718aab3e434575f3faef0afd3c66552e42f178f (patch)
tree0bf28e18b265b923f808bf5cee37358cb728d0f9 /merge-tree.c
parentae44b235d49db30324819f4775897d9a74ee1aad (diff)
parent3b67d2917a0e93aa583c4069f5a00655e05dbd84 (diff)
downloadgit-1718aab3e434575f3faef0afd3c66552e42f178f.tar.gz
git-1718aab3e434575f3faef0afd3c66552e42f178f.tar.xz
Merge branch 'jc/unpack'
* jc/unpack: unpack-objects -r: call it "recover". unpack-objects desperately salvages objects from a corrupt pack
Diffstat (limited to 'merge-tree.c')
0 files changed, 0 insertions, 0 deletions