summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xcommit-remove-pointless-commit (renamed from remove-pointless-commit.rb)0
-rw-r--r--git-filter-branch-magic.txt11
-rwxr-xr-xmsg-record-original-commit (renamed from record-original-commit.sh)0
3 files changed, 0 insertions, 11 deletions
diff --git a/remove-pointless-commit.rb b/commit-remove-pointless-commit
index ba33522..ba33522 100755
--- a/remove-pointless-commit.rb
+++ b/commit-remove-pointless-commit
diff --git a/git-filter-branch-magic.txt b/git-filter-branch-magic.txt
deleted file mode 100644
index 8fbd83f..0000000
--- a/git-filter-branch-magic.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-find . -name .git -prune -o -type d -o -print | grep -v Ant | grep -v ant | xargs rm -f
-
-# TODO: need to generalize the filtering logic
-# git update-index generates no index file if stdin is empty
-# this also reduces empty commits as much as possible
-# "ant\|Ant"
-git filter-branch -f --prune-empty --msg-filter ~/ws/git-filter-branch-tools/record-original-commit.sh --index-filter 'git ls-files -s | grep "Javadoc\|javadoc" | GIT_INDEX_FILE=$GIT_INDEX_FILE.new git update-index --index-info && ((test -f $GIT_INDEX_FILE.new && mv $GIT_INDEX_FILE.new $GIT_INDEX_FILE) || rm -f $GIT_INDEX_FILE)' HEAD
-
-# remove all the other pointless merges
-git filter-branch -f --commit-filter "~/ws/git-filter-branch-tools/remove-pointless-commit.rb \"\$@\"" HEAD
-
diff --git a/record-original-commit.sh b/msg-record-original-commit
index cbb96e1..cbb96e1 100755
--- a/record-original-commit.sh
+++ b/msg-record-original-commit