Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
filter-branch documentation: some more touch-ups.
author
Johannes Sixt
<johannes.sixt@telecom.at>
Wed, 4 Jul 2007 07:32:47 +0000
(09:32 +0200)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 4 Jul 2007 20:32:41 +0000
(13:32 -0700)
- The map function used to fail, but no longer does (since
3520e1e8687
.)
- Fix the "edge-graft" example.
- Show the same using .git/info/grafts.
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-filter-branch.txt
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
b5669a0
)
diff --git
a/Documentation/git-filter-branch.txt
b/Documentation/git-filter-branch.txt
index 363287d0ab39e1189cec4090f767cfe0ce1511fe..219a81db0c3bc50eb832c37f83054373d6235973 100644
(file)
--- a/
Documentation/git-filter-branch.txt
+++ b/
Documentation/git-filter-branch.txt
@@
-58,8
+58,9
@@
and GIT_COMMITTER_DATE are set according to the current commit.
A 'map' function is available that takes an "original sha1 id" argument
and outputs a "rewritten sha1 id" if the commit has been already
A 'map' function is available that takes an "original sha1 id" argument
and outputs a "rewritten sha1 id" if the commit has been already
-rewritten, fails otherwise; the 'map' function can return several
-ids on separate lines if your commit filter emitted multiple commits.
+rewritten, and "original sha1 id" otherwise; the 'map' function can
+return several ids on separate lines if your commit filter emitted
+multiple commits.
OPTIONS
OPTIONS
@@
-166,12
+167,13
@@
git filter-branch --index-filter 'git update-index --remove filename' newbranch
Now, you will get the rewritten history saved in the branch 'newbranch'
(your current branch is left untouched).
Now, you will get the rewritten history saved in the branch 'newbranch'
(your current branch is left untouched).
-To "etch-graft" a commit to the revision history (set a commit to be
-the parent of the current initial commit and propagate that):
+To set a commit (which typically is at the tip of another
+history) to be the parent of the current initial commit, in
+order to paste the other history behind the current history:
-----------------------------------------------------------------------
-git filter-branch --parent-filter
sed\ 's/^$/-p <graft-id>/
' newbranch
-----------------------------------------------------------------------
+----------------------------------------------------------------------
--
+git filter-branch --parent-filter
'sed "s/^\$/-p <graft-id>/"
' newbranch
+----------------------------------------------------------------------
--
(if the parent string is empty - therefore we are dealing with the
initial commit - add graftcommit as a parent). Note that this assumes
(if the parent string is empty - therefore we are dealing with the
initial commit - add graftcommit as a parent). Note that this assumes
@@
-183,6
+185,13
@@
git filter-branch --parent-filter \
'cat; test $GIT_COMMIT = <commit-id> && echo "-p <graft-id>"' newbranch
-------------------------------------------------------------------------------
'cat; test $GIT_COMMIT = <commit-id> && echo "-p <graft-id>"' newbranch
-------------------------------------------------------------------------------
+or even simpler:
+
+-----------------------------------------------
+echo "$commit-id $graft-id" >> .git/info/grafts
+git filter-branch newbranch $graft-id..
+-----------------------------------------------
+
To remove commits authored by "Darl McBribe" from the history:
------------------------------------------------------------------------------
To remove commits authored by "Darl McBribe" from the history:
------------------------------------------------------------------------------