From: Junio C Hamano Date: Mon, 5 Jun 2017 00:03:22 +0000 (+0900) Subject: Merge branch 'ah/doc-filter-branch-export-env' into maint X-Git-Tag: v2.13.1~2 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f166aab8bf877d7448f5bc7257fd43db66983a55?ds=inline;hp=-c Merge branch 'ah/doc-filter-branch-export-env' into maint Docfix. * ah/doc-filter-branch-export-env: doc: filter-branch does not require re-export of vars --- f166aab8bf877d7448f5bc7257fd43db66983a55 diff --combined Documentation/git-filter-branch.txt index 6e4bb02204,a78655d913..7b695dbb72 --- a/Documentation/git-filter-branch.txt +++ b/Documentation/git-filter-branch.txt @@@ -86,8 -86,7 +86,7 @@@ OPTION This filter may be used if you only need to modify the environment in which the commit will be performed. Specifically, you might want to rewrite the author/committer name/email/time environment - variables (see linkgit:git-commit-tree[1] for details). Do not forget - to re-export the variables. + variables (see linkgit:git-commit-tree[1] for details). --tree-filter :: This is the filter for rewriting the tree and its contents. @@@ -167,12 -166,14 +166,12 @@@ to other tags will be rewritten to poin project root. Implies <>. --prune-empty:: - Some kind of filters will generate empty commits, that left the tree - untouched. This switch allow git-filter-branch to ignore such - commits. Though, this switch only applies for commits that have one - and only one parent, it will hence keep merges points. Also, this - option is not compatible with the use of `--commit-filter`. Though you - just need to use the function 'git_commit_non_empty_tree "$@"' instead - of the `git commit-tree "$@"` idiom in your commit filter to make that - happen. + Some filters will generate empty commits that leave the tree untouched. + This option instructs git-filter-branch to remove such commits if they + have exactly one or zero non-pruned parents; merge commits will + therefore remain intact. This option cannot be used together with + `--commit-filter`, though the same effect can be achieved by using the + provided `git_commit_non_empty_tree` function in a commit filter. --original :: Use this option to set the namespace where the original commits @@@ -340,12 -341,10 +339,10 @@@ git filter-branch --env-filter if test "$GIT_AUTHOR_EMAIL" = "root@localhost" then GIT_AUTHOR_EMAIL=john@example.com - export GIT_AUTHOR_EMAIL fi if test "$GIT_COMMITTER_EMAIL" = "root@localhost" then GIT_COMMITTER_EMAIL=john@example.com - export GIT_COMMITTER_EMAIL fi ' -- --all --------------------------------------------------------