]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5d01301 3013d98)
Merge branch 'pb/pull-rebase-autostash-fix'
authorJunio C Hamano <gitster@pobox.com>
Sat, 5 Feb 2022 17:42:28 +0000 (09:42 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 5 Feb 2022 17:42:28 +0000 (09:42 -0800)
"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

1  2 
builtin/pull.c patch | diff1 | diff2 | blob | history

diff --cc builtin/pull.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.