From 69f491759956153218a1ac862629c439a194d865 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 26 Feb 2008 09:17:34 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.4.3-230-g2db511 --- git-am.html | 4 ++-- git-am.txt | 2 +- git-filter-branch.html | 17 ++++++++++++++--- git-filter-branch.txt | 15 +++++++++++++-- 4 files changed, 30 insertions(+), 8 deletions(-) diff --git a/git-am.html b/git-am.html index 70c6f87ce..bfa9169ad 100644 --- a/git-am.html +++ b/git-am.html @@ -488,7 +488,7 @@ hand resolve the conflict in the working directory, and update

The command refuses to process new mailboxes while .dotest directory exists, so if you decide to start over from scratch, -run rm -f .dotest before running the command with mailbox +run rm -f -r .dotest before running the command with mailbox names.

SEE ALSO

@@ -509,7 +509,7 @@ names.

diff --git a/git-am.txt b/git-am.txt index 2ffba2102..e640fc75c 100644 --- a/git-am.txt +++ b/git-am.txt @@ -138,7 +138,7 @@ aborts in the middle,. You can recover from this in one of two ways: The command refuses to process new mailboxes while `.dotest` directory exists, so if you decide to start over from scratch, -run `rm -f .dotest` before running the command with mailbox +run `rm -f -r .dotest` before running the command with mailbox names. diff --git a/git-filter-branch.html b/git-filter-branch.html index 036b3efe1..c8d3323d3 100644 --- a/git-filter-branch.html +++ b/git-filter-branch.html @@ -313,7 +313,9 @@ notable exception of the commit filter, for technical reasons). Prior to that, the $GIT_COMMIT environment variable will be set to contain the id of the commit being rewritten. Also, GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, GIT_AUTHOR_DATE, GIT_COMMITTER_NAME, GIT_COMMITTER_EMAIL, -and GIT_COMMITTER_DATE are set according to the current commit.

+and GIT_COMMITTER_DATE are set according to the current commit. If any +evaluation of <command> returns a non-zero exit status, the whole operation +will be aborted.

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, and "original sha1 id" otherwise; the map function can @@ -504,7 +506,7 @@ happened). If this is not the case, use:

git filter-branch --parent-filter \
-        'cat; test $GIT_COMMIT = <commit-id> && echo "-p <graft-id>"' HEAD
+ 'test $GIT_COMMIT = <commit-id> && echo "-p <graft-id>" || cat' HEAD

or even simpler:

@@ -542,6 +544,15 @@ parameters. Note that this handles merges properly! In case Darl committed a merge between P1 and P2, it will be propagated properly and all children of the merge will become merge commits with P1,P2 as their parents instead of the merge commit.

+

You can rewrite the commit log messages using --message-filter. For +example, git-svn-id strings in a repository created by git-svn can +be removed this way:

+
+
+
git filter-branch --message-filter '
+        sed -e "/^git-svn-id:/d"
+'
+

To restrict rewriting to only part of the history, specify a revision range in addition to the new branch name. The new branch name will point to the top-most revision that a git rev-list of this range @@ -593,7 +604,7 @@ and the git list <git@vger.kernel.org>

diff --git a/git-filter-branch.txt b/git-filter-branch.txt index e22dfa580..543a1cf10 100644 --- a/git-filter-branch.txt +++ b/git-filter-branch.txt @@ -56,7 +56,9 @@ notable exception of the commit filter, for technical reasons). Prior to that, the $GIT_COMMIT environment variable will be set to contain the id of the commit being rewritten. Also, GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, GIT_AUTHOR_DATE, GIT_COMMITTER_NAME, GIT_COMMITTER_EMAIL, -and GIT_COMMITTER_DATE are set according to the current commit. +and GIT_COMMITTER_DATE are set according to the current commit. If any +evaluation of returns a non-zero exit status, the whole operation +will be aborted. A 'map' function is available that takes an "original sha1 id" argument and outputs a "rewritten sha1 id" if the commit has been already @@ -197,7 +199,7 @@ happened). If this is not the case, use: -------------------------------------------------------------------------- git filter-branch --parent-filter \ - 'cat; test $GIT_COMMIT = && echo "-p "' HEAD + 'test $GIT_COMMIT = && echo "-p " || cat' HEAD -------------------------------------------------------------------------- or even simpler: @@ -240,6 +242,15 @@ committed a merge between P1 and P2, it will be propagated properly and all children of the merge will become merge commits with P1,P2 as their parents instead of the merge commit. +You can rewrite the commit log messages using `--message-filter`. For +example, `git-svn-id` strings in a repository created by `git-svn` can +be removed this way: + +------------------------------------------------------- +git filter-branch --message-filter ' + sed -e "/^git-svn-id:/d" +' +------------------------------------------------------- To restrict rewriting to only part of the history, specify a revision range in addition to the new branch name. The new branch name will -- 2.26.2