Merge pull request #412 from spacewander/git-obliterate

update git obliterate

Author: hemanth

bin/git-obliterate

@@ -1,4 +1,23 @@
 #!/usr/bin/env bash
-file="$1"
+
+file=""
+range=""
+for i in "$@"
+do
+    # use '--' to seperate file list and rev-list arguments
+    test "$i" == '--' && shift && break
+    file="$file"' '"$i"
+    shift
+done
+test -n "$*" && range="$*"
+
 test -z "$file" && echo "file required." 1>&2 && exit 1
-git filter-branch -f --index-filter "git rm -r --cached '$file' --ignore-unmatch" --prune-empty --tag-name-filter cat -- --all
+if [ -z "$range" ]
+then
+    git filter-branch -f --index-filter "git rm -r --cached ""$file"" --ignore-unmatch" \
+        --prune-empty --tag-name-filter cat -- --all
+else
+    # don't quote $range so that we can forward multiple rev-list arguments
+    git filter-branch -f --index-filter "git rm -r --cached ""$file"" --ignore-unmatch" \
+        --prune-empty --tag-name-filter cat -- $range
+fi

man/git-obliterate.1

@@ -0,0 +1,64 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "GIT\-OBLITERATE" "1" "August 2015" "" ""
+.
+.SH "NAME"
+\fBgit\-obliterate\fR \- rewrite past commits to remove some files
+.
+.SH "SYNOPSIS"
+git obliterate <files\.\.\.> [\-\- <rev\-list options\.\.\.>]
+.
+.SH "DESCRIPTION"
+Completely remove some files from the repository, including past commits and tags\. WARNING! This command will rewirte the history similar to \fBgit rebase\fR(though it affects more)\. The rewritten history will have different object names for all the objects and will not converge with the original branch\. So \fBavoid using it on commits that you shared\fR\. And it will mess up stash, so \fBdon\'t have stash when you run \fBgit obliterate\fR\fR\.
+.
+.SH "OPTIONS"
+You can pass rev\-list options to indicate the range of commits affected\. Those options need to be seperated with \'\-\-\' before them\. Run \fBgit help rev\-list\fR to see the acceptable options\.
+.
+.SH "Examples"
+Remove \.secret from the repository:
+.
+.IP "" 4
+.
+.nf
+
+$ git obliterate \.secret
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Remove \.secret from commits between origin and feature:
+.
+.IP "" 4
+.
+.nf
+
+$ git obliterate \.secret \-\- feature ^origin
+.
+.fi
+.
+.IP "" 0
+.
+.P
+Remove \.secret from commit abcdefg to commit 1234567
+.
+.IP "" 4
+.
+.nf
+
+$ git obliterate \.secret \-\- abcdefg\.\.1234567
+.
+.fi
+.
+.IP "" 0
+.
+.SH "AUTHOR"
+Written by <\fIbrianloveswords@gmail\.com\fR>
+.
+.SH "REPORTING BUG"
+<\fIhttps://github\.com/tj/git\-extras/issues\fR>
+.
+.SH "SEE ALSO"
+<\fIhttps://github\.com/tj/git\-extras\fR>

man/git-obliterate.1.html

@@ -0,0 +1,42 @@
+git-obliterate(1) -- rewrite past commits to remove some files
+===============================
+
+## SYNOPSIS
+
+git obliterate <files...> [-- <rev-list options...>]
+
+## DESCRIPTION
+
+Completely remove some files from the repository, including past commits and tags. 
+WARNING! This command will rewirte the history similar to `git rebase`(though it affects more). The rewritten history will have different object names for all the objects and will not converge with the original branch. So **avoid using it on commits that you shared**.
+And it will mess up stash, so **don't have stash when you run `git obliterate`**.
+
+## OPTIONS
+
+You can pass rev-list options to indicate the range of commits affected. Those options need to be seperated with '--' before them. Run `git help rev-list` to see the acceptable options.
+
+## Examples
+
+  Remove .secret from the repository:
+
+    $ git obliterate .secret
+
+  Remove .secret from commits between origin and feature:
+
+    $ git obliterate .secret -- feature ^origin
+
+  Remove .secret from commit abcdefg to commit 1234567
+
+    $ git obliterate .secret -- abcdefg..1234567
+
+## AUTHOR
+
+Written by &lt;<[email protected]>&gt;
+
+## REPORTING BUG
+
+&lt;<https://github.com/tj/git-extras/issues>&gt;
+
+## SEE ALSO
+
+&lt;<https://github.com/tj/git-extras>&gt;