diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-09-30 13:19:29 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-09-30 13:19:29 +0900 |
| commit | 91243b019ddba5248f0fde319bc75e4e2b5602b0 (patch) | |
| tree | d551e69310943710f453b89a39f6408c9d9d9242 /Documentation/git-rebase.txt | |
| parent | 9bc67b6658a031b92cba4a7489b78a4da902ecbf (diff) | |
| parent | 483e861111444b1e7c5c6a8442f2a306508adfb0 (diff) | |
| download | git-91243b019ddba5248f0fde319bc75e4e2b5602b0.tar.gz | |
Merge branch 'en/filter-branch-deprecation'
Start discouraging the use of "git filter-branch".
* en/filter-branch-deprecation:
t9902: use a non-deprecated command for testing
Recommend git-filter-repo instead of git-filter-branch
t6006: simplify, fix, and optimize empty message test
Diffstat (limited to 'Documentation/git-rebase.txt')
| -rw-r--r-- | Documentation/git-rebase.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 3136c19fb4..7ecf766077 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -830,7 +830,8 @@ Hard case: The changes are not the same.:: This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or - `filter-branch`. + a full history rewriting command like + https://github.com/newren/git-filter-repo[`filter-repo`]. The easy case |