From: Mehul Jain <mehul.jain2029@gmail.com>
To: git@vger.kernel.org
Cc: me@ikke.info, pyokagan@gmail.com, Mehul Jain <mehul.jain2029@gmail.com>
Subject: [GSoC] Microproject :- Teaching git pull --rebase the --no-autostash flag
Date: Fri, 26 Feb 2016 16:53:44 +0530 [thread overview]
Message-ID: <1456485825-21309-1-git-send-email-mehul.jain2029@gmail.com> (raw)
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
next reply other threads:[~2016-02-26 11:25 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-26 11:23 Mehul Jain [this message]
2016-02-26 11:23 ` [PATCH] Add --no-autostash flag to git pull --rebase Mehul Jain
2016-02-26 12:47 ` Paul Tan
2016-02-26 17:09 ` Mehul Jain
2016-02-26 11:51 ` [GSoC] Microproject :- Teaching git pull --rebase the --no-autostash flag Paul Tan
2016-02-26 12:05 ` Mehul Jain
2016-02-26 13:16 ` Matthieu Moy
2016-02-26 19:17 ` Philip Oakley
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1456485825-21309-1-git-send-email-mehul.jain2029@gmail.com \
--to=mehul.jain2029@gmail.com \
--cc=git@vger.kernel.org \
--cc=me@ikke.info \
--cc=pyokagan@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).