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
before).


I think it was we Brit's who are to blame. While less frequent these days it 
was common here in Briton. I certainly use it sometimes ;-)


http://english.stackexchange.com/questions/31060/is-it-proper-to-use-a-colon-followed-immediately-by-a-hyphen

https://www.quora.com/What-is-this-punctuation-called (originalism would 
also suggest USA..)





Mehul Jain <mehul.jain2...@gmail.com> writes:

With this patch, git pull --rebase will understand --no-autostash command 
line flag.

This flag will override "rebase.autostash" configuration(if set)


Here and elsewhere: space before "(".

--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--


Philip 


--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

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> writes:

> With this patch, git pull --rebase will understand --no-autostash command 
> line flag.
> This flag will override "rebase.autostash" configuration(if set)

Here and elsewhere: space before "(".

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

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 "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

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 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.

That was the point of the microproject ;-). --[no-]autostash means
both --autostash and --no-autostash.

Thanks,
Paul
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[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 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

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html