diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-09-28 05:47:52 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-28 05:47:52 (GMT) |
| commit | 386dd12b55597a33c34520ad1138cd45fd084424 (patch) | |
| tree | 35ede299ab98bc437aa5fc9adcbd2285f1da2b25 /Documentation | |
| parent | a515136c523cca1d4c5ea2b3c46b3f26bbd22639 (diff) | |
| parent | b2c1ca6b4baa31c674c86dae38d27ebab4b69e39 (diff) | |
| download | git-386dd12b55597a33c34520ad1138cd45fd084424.zip git-386dd12b55597a33c34520ad1138cd45fd084424.tar.gz git-386dd12b55597a33c34520ad1138cd45fd084424.tar.bz2 | |
Merge branch 'ic/fix-filter-branch-to-handle-tag-without-tagger'
"git filter-branch" cannot reproduce a history with a tag without
the tagger field, which only ancient versions of Git allowed to be
created. This has been corrected.
* ic/fix-filter-branch-to-handle-tag-without-tagger:
filter-branch: use hash-object instead of mktag
filter-branch: stash away ref map in a branch
filter-branch: preserve and restore $GIT_AUTHOR_* and $GIT_COMMITTER_*
filter-branch: reset $GIT_* before cleaning up
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-filter-branch.txt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.txt index 9e5169a..bebdcde 100644 --- a/Documentation/git-filter-branch.txt +++ b/Documentation/git-filter-branch.txt @@ -14,7 +14,7 @@ SYNOPSIS [--commit-filter <command>] [--tag-name-filter <command>] [--subdirectory-filter <directory>] [--prune-empty] [--original <namespace>] [-d <directory>] [-f | --force] - [--] [<rev-list options>...] + [--state-branch <branch>] [--] [<rev-list options>...] DESCRIPTION ----------- @@ -198,6 +198,12 @@ to other tags will be rewritten to point to the underlying commit. directory or when there are already refs starting with 'refs/original/', unless forced. +--state-branch <branch>:: + This option will cause the mapping from old to new objects to + be loaded from named branch upon startup and saved as a new + commit to that branch upon exit, enabling incremental of large + trees. If '<branch>' does not exist it will be created. + <rev-list options>...:: Arguments for 'git rev-list'. All positive refs included by these options are rewritten. You may also specify options |