summaryrefslogtreecommitdiff
path: root/git-prune-script
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-18 19:12:00 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-18 19:12:00 (GMT)
commitb51ad4314078298194d23d46e2b4473ffd32a88a (patch)
tree3dfffcf747e4fbdb04f1b43251be932f69f55476 /git-prune-script
parenta4b7dbef4ef53f4fffbda0a6f5eada4c377e3fc5 (diff)
parentb5039db6d25ae25f1cb2db541ed13602784fafc3 (diff)
downloadgit-b51ad4314078298194d23d46e2b4473ffd32a88a.zip
git-b51ad4314078298194d23d46e2b4473ffd32a88a.tar.gz
git-b51ad4314078298194d23d46e2b4473ffd32a88a.tar.bz2
Merge the new object model thing from Daniel Barkalow
This was a real git merge with conflicts. I'll commit the scripts I used to do the merge next. Not pretty, but it's half-way functional.
Diffstat (limited to 'git-prune-script')
0 files changed, 0 insertions, 0 deletions