summaryrefslogtreecommitdiffstats
path: root/git-rebase.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-04-29 14:21:05 -0700
committerJunio C Hamano <gitster@pobox.com>2020-04-29 14:21:05 -0700
commit0dd50943c112dfc70367bd39eb3c88371db2518f (patch)
treef60fdfeafd48ad1b7c65220f044086e476422ecb /git-rebase.txt
parent67bf224a9fb3cd34ef712113c48f3144a9bc232a (diff)
downloadgit-htmldocs-0dd50943c112dfc70367bd39eb3c88371db2518f.tar.gz
Autogenerated HTML docs for v2.26.2-357-g86ab1
Diffstat (limited to 'git-rebase.txt')
-rw-r--r--git-rebase.txt14
1 files changed, 11 insertions, 3 deletions
diff --git a/git-rebase.txt b/git-rebase.txt
index bed500f15..2de862068 100644
--- a/git-rebase.txt
+++ b/git-rebase.txt
@@ -722,9 +722,17 @@ Hooks
~~~~~
The apply backend has not traditionally called the post-commit hook,
-while the merge backend has. However, this was by accident of
-implementation rather than by design. Both backends should have the
-same behavior, though it is not clear which one is correct.
+while the merge backend has. Both have called the post-checkout hook,
+though the merge backend has squelched its output. Further, both
+backends only call the post-checkout hook with the starting point
+commit of the rebase, not the intermediate commits nor the final
+commit. In each case, the calling of these hooks was by accident of
+implementation rather than by design (both backends were originally
+implemented as shell scripts and happened to invoke other commands
+like 'git checkout' or 'git commit' that would call the hooks). Both
+backends should have the same behavior, though it is not entirely
+clear which, if any, is correct. We will likely make rebase stop
+calling either of these hooks in the future.
Interruptability
~~~~~~~~~~~~~~~~