diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-12-03 00:18:06 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-12-03 00:18:06 -0800 |
| commit | c692e1b6731da33ebfc2dfd72476057cd16aceb9 (patch) | |
| tree | 0a154d3c97fb63f0c8e6621f90f089e318a63746 /builtin/diff.c | |
| parent | e89ecfbb13f600e7fc0272c29de432e424a97aaa (diff) | |
| parent | 5176f20ffeab9c2bda6f93195096372364ec6f88 (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
Diffstat (limited to 'builtin/diff.c')
0 files changed, 0 insertions, 0 deletions