git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e89ecfb 5176f20)
Merge branch 'pb/pull-rebase-recurse-submodules'
authorJunio C Hamano <redacted>
Thu, 3 Dec 2020 08:18:06 +0000 (00:18 -0800)
committerJunio C Hamano <redacted>
Thu, 3 Dec 2020 08:18:06 +0000 (00:18 -0800)
commitc692e1b6731da33ebfc2dfd72476057cd16aceb9
tree0a154d3c97fb63f0c8e6621f90f089e318a63746tree | snapshot
parente89ecfbb13f600e7fc0272c29de432e424a97aaacommit | diff
parent5176f20ffeab9c2bda6f93195096372364ec6f88commit | diff
Merge branch 'pb/pull-rebase-recurse-submodules'

"git pull --rebase --recurse-submodules" checked for local changes
in a wrong range and failed to run correctly when it should.

* pb/pull-rebase-recurse-submodules:
  pull: check for local submodule modifications with the right range
  t5572: describe '--rebase' tests a little more
  t5572: add notes on a peculiar test
  pull --rebase: compute rebase arguments in separate function
builtin/pull.c diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT