diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2022-02-05 09:42:28 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-02-05 09:42:28 -0800 |
| commit | 7a9ae6d0d9cf979a2b1a018135370dd6331e505c (patch) | |
| tree | fb90a763cce57ab47ce43d6157d41917eef56a1e /t/t9810-git-p4-rcs.sh | |
| parent | Sync with Git 2.35.1 (diff) | |
| parent | pull --rebase: honor rebase.autostash when fast-forwarding (diff) | |
| download | tgif-7a9ae6d0d9cf979a2b1a018135370dd6331e505c.tar.xz | |
Merge branch 'pb/pull-rebase-autostash-fix'
"git pull --rebase" ignored the rebase.autostash configuration
variable when the remote history is a descendant of our history,
which has been corrected.
* pb/pull-rebase-autostash-fix:
pull --rebase: honor rebase.autostash when fast-forwarding
Diffstat (limited to 't/t9810-git-p4-rcs.sh')
0 files changed, 0 insertions, 0 deletions