git-rebase.txt: add another hook to the hooks section, and explain more

For more discussion about these hooks, their history relative to rebase, and logical consistency between different types of operations, see https://lore.kernel.org/git/CABPp-BG0bFKUage5cN_2yr2DkmS04W2Z9Pg5WcROqHznV3XBdw@mail.gmail.com/ and the links to some threads referenced therein. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Elijah Newren committed Apr 5, 2020 at 00:00 UTC f7139e7cc2d97a18f1bccfe48c4a270372917c91

1 file changed +11 -3

Documentation/git-rebase.txt

+11 -3

@@ -684,9 +684,17 @@ Hooks

684 ~~~~~

685

686 The apply backend has not traditionally called the post-commit hook,

687 -while the merge backend has. However, this was by accident of

688 -implementation rather than by design. Both backends should have the

689 -same behavior, though it is not clear which one is correct.

687 +while the merge backend has. Both have called the post-checkout hook,

688 +though the merge backend has squelched its output. Further, both

689 +backends only call the post-checkout hook with the starting point

690 +commit of the rebase, not the intermediate commits nor the final

691 +commit. In each case, the calling of these hooks was by accident of

692 +implementation rather than by design (both backends were originally

693 +implemented as shell scripts and happened to invoke other commands

694 +like 'git checkout' or 'git commit' that would call the hooks). Both

695 +backends should have the same behavior, though it is not entirely

696 +clear which, if any, is correct. We will likely make rebase stop

697 +calling either of these hooks in the future.

698

699 Interruptability

700 ~~~~~~~~~~~~~~~~