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/githooks.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/githooks.txt')
-rw-r--r-- | Documentation/githooks.txt | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt index 57d6e2b98d..50365f2914 100644 --- a/Documentation/githooks.txt +++ b/Documentation/githooks.txt @@ -447,10 +447,12 @@ post-rewrite This hook is invoked by commands that rewrite commits (linkgit:git-commit[1] when called with `--amend` and -linkgit:git-rebase[1]; currently `git filter-branch` does 'not' call -it!). Its first argument denotes the command it was invoked by: -currently one of `amend` or `rebase`. Further command-dependent -arguments may be passed in the future. +linkgit:git-rebase[1]; however, full-history (re)writing tools like +linkgit:git-fast-import[1] or +https://github.com/newren/git-filter-repo[git-filter-repo] typically +do not call it!). Its first argument denotes the command it was +invoked by: currently one of `amend` or `rebase`. Further +command-dependent arguments may be passed in the future. The hook receives a list of the rewritten commits on stdin, in the format |