summaryrefslogtreecommitdiff
path: root/RelNotes
diff options
context:
space:
mode:
authorLibravatar Kevin Daudt <me@ikke.info>2015-07-04 23:42:38 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-07-22 12:56:30 -0700
commit53c76dc05e0b5ad5b1f92db9577694e896d67a0a (patch)
tree8b1fc77a72ae6d47d66838d83abd641d3b6c481e /RelNotes
parentpull: remove redirection to git-pull.sh (diff)
downloadtgif-53c76dc05e0b5ad5b1f92db9577694e896d67a0a.tar.xz
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>
Diffstat (limited to 'RelNotes')
0 files changed, 0 insertions, 0 deletions