git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b145660)
pull: allow dirty tree when rebase.autostash enabled
authorKevin Daudt <redacted>
Sat, 4 Jul 2015 21:42:38 +0000 (23:42 +0200)
committerJunio C Hamano <redacted>
Wed, 22 Jul 2015 19:56:30 +0000 (12:56 -0700)
commit53c76dc05e0b5ad5b1f92db9577694e896d67a0a
tree8b1fc77a72ae6d47d66838d83abd641d3b6c481etree | snapshot
parentb1456605c26eb6bd991b70b0ca0a3ce0f02473e9commit | diff
pull: allow dirty tree when rebase.autostash enabled

rebase learned to stash changes when it encounters a dirty work tree,
but git pull --rebase does not.

Only verify if the working tree is dirty when rebase.autostash is not
enabled.

Signed-off-by: Kevin Daudt <redacted>
Signed-off-by: Paul Tan <redacted>
Signed-off-by: Junio C Hamano <redacted>
builtin/pull.c diff | blob | history
t/t5520-pull.sh diff | blob | history
git clone https://git.99rst.org/PROJECT