Re: [GSoC] Microproject :- Teaching git pull --rebase the --no-autostash flag

2016-02-26 Thread Philip Oakley
From: "Matthieu Moy" <matthieu@grenoble-inp.fr> Hi, Some minor nits in addition to Paul's comments: Subject: Re: [GSoC] Microproject :- Teaching git pull --rebase the --no-autostash flag The ":-" is typically Indian. Just use ":" here (without a space

Re: [GSoC] Microproject :- Teaching git pull --rebase the --no-autostash flag

2016-02-26 Thread Matthieu Moy
Hi, Some minor nits in addition to Paul's comments: > Subject: Re: [GSoC] Microproject :- Teaching git pull --rebase the > --no-autostash flag The ":-" is typically Indian. Just use ":" here (without a space before). Mehul Jain <mehul.jain2...@gmail.com> writ

Re: [GSoC] Microproject :- Teaching git pull --rebase the --no-autostash flag

2016-02-26 Thread Mehul Jain
On Fri, Feb 26, 2016 at 5:21 PM, Paul Tan wrote: > That was the point of the microproject ;-). --[no-]autostash means > both --autostash and --no-autostash. Oops, my bad. I will add the necessary changes :-). Thanks, Mehul -- To unsubscribe from this list: send the line

Re: [GSoC] Microproject :- Teaching git pull --rebase the --no-autostash flag

2016-02-26 Thread Paul Tan
On Fri, Feb 26, 2016 at 7:23 PM, Mehul Jain wrote: > 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

[GSoC] Microproject :- Teaching git pull --rebase the --no-autostash flag

2016-02-26 Thread Mehul Jain
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