]> git.ipfire.org Git - thirdparty/git.git/commit - t/t0201-gettext-fallbacks.sh
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit7a9ae6d0d9cf979a2b1a018135370dd6331e505c
treefb90a763cce57ab47ce43d6157d41917eef56a1etree | snapshot
parent5d01301f2b865aa8dba1654d3f447ce9d21db0b5commit | diff
parent3013d98d7a09b42a111a355db286e72ee03b2e94commit | diff
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
builtin/pull.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.