diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-02-05 17:42:28 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-02-05 17:42:28 (GMT) |
| commit | 7a9ae6d0d9cf979a2b1a018135370dd6331e505c (patch) | |
| tree | fb90a763cce57ab47ce43d6157d41917eef56a1e /tree-diff.c | |
| parent | 5d01301f2b865aa8dba1654d3f447ce9d21db0b5 (diff) | |
| parent | 3013d98d7a09b42a111a355db286e72ee03b2e94 (diff) | |
| download | git-7a9ae6d0d9cf979a2b1a018135370dd6331e505c.zip git-7a9ae6d0d9cf979a2b1a018135370dd6331e505c.tar.gz git-7a9ae6d0d9cf979a2b1a018135370dd6331e505c.tar.bz2 | |
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
Diffstat (limited to 'tree-diff.c')
0 files changed, 0 insertions, 0 deletions