path: root/git-prune-script
diff options
authorLinus Torvalds <>2005-04-18 19:15:10 (GMT)
committerLinus Torvalds <>2005-04-18 19:15:10 (GMT)
commit839a7a06f35bf8cd563a41d6db97f453ab108129 (patch)
treed7d681633af8bac34d18dbdcd526c301a4818a5e /git-prune-script
parentb51ad4314078298194d23d46e2b4473ffd32a88a (diff)
Add the simple scripts I used to do a merge with content conflicts.
They sure as hell aren't perfect, but they allow you to do: ./git-pull-script {other-git-directory} to do the initial merge, and if that had content clashes, you do merge-cache ./git-merge-one-file-script -a which tries to auto-merge. When/if the auto-merge fails, it will leave the last file in your working directory, and you can edit it and then when you're happy you can do "update-cache filename" on it. Re-do the merge-cache thing until there are no files left to be merged, and now you can write the tree and commit: write-tree commit-tree .... -p $(cat .git/HEAD) -p $(cat .git/MERGE_HEAD) and you're done.
Diffstat (limited to 'git-prune-script')
1 files changed, 2 insertions, 0 deletions
diff --git a/git-prune-script b/git-prune-script
new file mode 100755
index 0000000..d0f19f1
--- /dev/null
+++ b/git-prune-script
@@ -0,0 +1,2 @@
+fsck-cache --unreachable $(cat .git/HEAD ) | grep unreachable | cut -d' ' -f3 | sed 's:^\(..\):.git/objects/\1/:' | xargs rm