From 839a7a06f35bf8cd563a41d6db97f453ab108129 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Mon, 18 Apr 2005 12:15:10 -0700 Subject: 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. --- git-prune-script | 2 ++ 1 file changed, 2 insertions(+) create mode 100755 git-prune-script (limited to 'git-prune-script') diff --git a/git-prune-script b/git-prune-script new file mode 100755 index 000000000..d0f19f19e --- /dev/null +++ b/git-prune-script @@ -0,0 +1,2 @@ +#!/bin/sh +fsck-cache --unreachable $(cat .git/HEAD ) | grep unreachable | cut -d' ' -f3 | sed 's:^\(..\):.git/objects/\1/:' | xargs rm -- cgit v1.2.1