pull --rebase: add --[no-]autostash flag
authorMehul Jain <redacted>
Mon, 21 Mar 2016 18:18:03 +0000 (23:48 +0530)
committerJunio C Hamano <redacted>
Mon, 21 Mar 2016 20:30:36 +0000 (13:30 -0700)
commitf66398eb57c627169429f47bbe4d943d2c975959
tree39b8fcb3543a6f5ebb800bf7a14b0c1590783d3d
parentc48d73bdececb38af237450724b1a67307d7a013
pull --rebase: add --[no-]autostash flag

If rebase.autoStash configuration variable is set, there is no way to
override it for "git pull --rebase" from the command line.

Teach "git pull --rebase" the --[no-]autostash command line flag which
overrides the current value of rebase.autoStash, if set. As "git rebase"
understands the --[no-]autostash option, it's just a matter of passing
the option to underlying "git rebase" when "git pull --rebase" is called.

Helped-by: Matthieu Moy <redacted>
Helped-by: Junio C Hamano <redacted>
Helped-by: Paul Tan <redacted>
Helped-by: Eric Sunshine <redacted>
Signed-off-by: Mehul Jain <redacted>
Signed-off-by: Junio C Hamano <redacted>
Documentation/git-pull.txt
builtin/pull.c
t/t5520-pull.sh
git clone https://git.99rst.org/PROJECT