| commit | 53c76dc05e0b5ad5b1f92db9577694e896d67a0a | |
| author | Kevin Daudt <me@ikke.info> | |
| Sat, 4 Jul 2015 21:42:38 +0000 (4 23:42 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 22 Jul 2015 19:56:30 +0000 (22 12:56 -0700) | ||
| tree | 8b1fc77a72ae6d47d66838d83abd641d3b6c481e | treesnapshot (tar.gz zip) |
| parent | b1456605c26eb6bd991b70b0ca0a3ce0f02473e9 | commitdiff |
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 <me@ikke.info>
Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 <me@ikke.info>
Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/pull.c | diffblobblamehistory | |
| t/t5520-pull.sh | diffblobblamehistory |