diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-04-22 13:42:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-04-22 13:42:47 -0700 |
| commit | dfdce31ce6c9c4d7266031ea70f982e7f22bb525 (patch) | |
| tree | 451a384d7d70ceaf0cf70f95f900d859de56826f /templates/hooks--pre-commit.sample | |
| parent | Merge branch 'dl/wrapper-fix-indentation' (diff) | |
| parent | pull: avoid running both merge and rebase (diff) | |
| download | tgif-dfdce31ce6c9c4d7266031ea70f982e7f22bb525.tar.xz | |
Merge branch 'en/pull-do-not-rebase-after-fast-forwarding'
"git pull --rebase" tried to run a rebase even after noticing that
the pull results in a fast-forward and no rebase is needed nor
sensible, for the past few years due to a mistake nobody noticed.
* en/pull-do-not-rebase-after-fast-forwarding:
pull: avoid running both merge and rebase
Diffstat (limited to 'templates/hooks--pre-commit.sample')
0 files changed, 0 insertions, 0 deletions