Junio C Hamano 7a9ae6d0d9 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

2022-02-05 09:42:28 -08:00

33 KiB

Raw Blame History

View Raw