From: Mehul Jain Date: Fri, 26 Feb 2016 11:23:44 GMT Subject: [GSoC] Microproject :- Teaching git pull --rebase the --no-autostash flag Message-ID: <1456485825-21309-1-git-send-email-mehul.jain2029@gmail.com> With this patch, git pull --rebase will understand --no-autostash command line flag. This flag will override "rebase.autostash" configuration(if set) and leads to a failure if current working directory is dirty. If "rebase.autostash" is not configured and no flag is passed then by default command will die if directory is to be dirty, before even calling rebase. I am also thinking of adding a "--autostash" flag for git pull --rebase, which will override "rebase.autostash" configuration(if set false) and will pass --autostash to git rebase. I would like to know your opinion on this option. Thanks! Mehul Jain (1): Add --no-autostash flag to git pull --rebase builtin/pull.c | 12 ++++++++---- t/t5520-pull.sh | 8 ++++++++ t/t5521-pull-options.sh | 24 ++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 4 deletions(-) -- 2.7.1.340.g69eb491.dirty