kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'ah/doc-filter-branch-export-env' 

Docfix.

* ah/doc-filter-branch-export-env:
  doc: filter-branch does not require re-export of vars
maint
Junio C Hamano 2017-06-04 09:55:43 +09:00
parent 634ccf4ca3 ba746ff9c9
commit 5160b821e9
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/git-filter-branch.txt
View File

@ -86,8 +86,7 @@ OPTIONS
This filter may be used if you only need to modify the environment This filter may be used if you only need to modify the environment
in which the commit will be performed. Specifically, you might in which the commit will be performed. Specifically, you might
want to rewrite the author/committer name/email/time environment want to rewrite the author/committer name/email/time environment
variables (see linkgit:git-commit-tree[1] for details). Do not forget variables (see linkgit:git-commit-tree[1] for details).
to re-export the variables.


--tree-filter <command>:: --tree-filter <command>::
This is the filter for rewriting the tree and its contents. This is the filter for rewriting the tree and its contents.
@ -340,12 +339,10 @@ git filter-branch --env-filter '
if test "$GIT_AUTHOR_EMAIL" = "root@localhost" if test "$GIT_AUTHOR_EMAIL" = "root@localhost"
then then
GIT_AUTHOR_EMAIL=john@example.com GIT_AUTHOR_EMAIL=john@example.com
export GIT_AUTHOR_EMAIL
fi fi
if test "$GIT_COMMITTER_EMAIL" = "root@localhost" if test "$GIT_COMMITTER_EMAIL" = "root@localhost"
then then
GIT_COMMITTER_EMAIL=john@example.com GIT_COMMITTER_EMAIL=john@example.com
export GIT_COMMITTER_EMAIL
fi fi
' -- --all ' -- --all
-------------------------------------------------------- --------------------------------------------------------