git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Git List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 0/3] Introduce pull.autostash
Date: Fri, 22 Mar 2013 17:59:56 +0530	[thread overview]
Message-ID: <1363955399-13153-1-git-send-email-artagnon@gmail.com> (raw)

This series adds a pull.autostash, making 'git pull' a tad bit more
usable.  It is part of my bigger plan to make 'git pull' just DTRT
(via configuration variables) in 90% of the cases.

[1/3] and [2/3] are tiny "while we're here" patches.
[3/3] is the main patch with tests.

Thanks for reading.

Ramkumar Ramachandra (3):
  git-pull.sh: prefer invoking "git <command>" over "git-<command>"
  t5521 (pull-options): use test_commit() where appropriate
  git-pull.sh: introduce --[no-]autostash and pull.autostash

 Documentation/config.txt   |  5 ++++
 Documentation/git-pull.txt |  7 ++++++
 git-pull.sh                | 30 +++++++++++++++++++---
 t/t5521-pull-options.sh    | 63 ++++++++++++++++++++++++++++++++++++++++++++--
 4 files changed, 99 insertions(+), 6 deletions(-)

-- 
1.8.2.141.gad203c2.dirty

             reply	other threads:[~2013-03-22 12:29 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-22 12:29 Ramkumar Ramachandra [this message]
2013-03-22 12:29 ` [PATCH 1/3] git-pull.sh: prefer invoking "git <command>" over "git-<command>" Ramkumar Ramachandra
2013-03-22 12:29 ` [PATCH 2/3] t5521 (pull-options): use test_commit() where appropriate Ramkumar Ramachandra
2013-03-22 16:51   ` Junio C Hamano
2013-03-23 12:38     ` Ramkumar Ramachandra
2013-03-22 12:29 ` [PATCH 3/3] git-pull.sh: introduce --[no-]autostash and pull.autostash Ramkumar Ramachandra
2013-03-22 17:02   ` Junio C Hamano
2013-03-23 12:48     ` Ramkumar Ramachandra
2013-03-24  7:28       ` Junio C Hamano
2013-03-24 17:56         ` Ramkumar Ramachandra
2013-03-24 21:12           ` Ramkumar Ramachandra

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=1363955399-13153-1-git-send-email-artagnon@gmail.com \
    --to=artagnon@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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).