From: Jonathan Nieder <jrnieder@gmail.com>
To: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Cc: Junio C Hamano <gitster@pobox.com>,
Ramkumar Ramachandra <artagnon@gmail.com>,
Git List <git@vger.kernel.org>
Subject: Re: [PATCH 3/3] pull: introduce --[no-]autostash and pull.autostash
Date: Mon, 15 Apr 2013 20:09:48 -0700 [thread overview]
Message-ID: <20130416030948.GJ3262@elie.Belkin> (raw)
In-Reply-To: <vpqbo9gqcvl.fsf@grenoble-inp.fr>
Matthieu Moy wrote:
> Junio C Hamano <gitster@pobox.com> writes:
>> Yes, that is why I said for pull-merge, --authsquash is neutral-to-better
>> and pull.autosquash is harmful.
>
> To speak from my experience: I find myself typing "git stash && git pull
> && git stash pop" relatively often.
To that end, maybe "git pull --stash" would be an easier to type option
name than "git pull --autostash".
That would also avoid the question of "What is automatically going to
happen here? Is it going to stash only sometimes? Is it going to
automatically stash what I pull?".
I'm not a big stash user (except "git stash --keep-index" to prepare
to test changes in the index), so I can't say much more about the
details.
Thanks,
Jonathan
next prev parent reply other threads:[~2013-04-16 3:10 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-13 21:15 [PATCH v2 0/3] Introduce pull.autostash Ramkumar Ramachandra
2013-04-13 21:15 ` [PATCH 1/3] pull: prefer invoking "git <command>" over "git-<command>" Ramkumar Ramachandra
2013-04-14 9:09 ` Philip Oakley
2013-04-13 21:15 ` [PATCH 2/3] t5521 (pull-options): use test_commit() where appropriate Ramkumar Ramachandra
2013-04-13 21:15 ` [PATCH 3/3] pull: introduce --[no-]autostash and pull.autostash Ramkumar Ramachandra
2013-04-15 5:47 ` Junio C Hamano
2013-04-15 12:31 ` Ramkumar Ramachandra
2013-04-15 15:16 ` Junio C Hamano
2013-04-15 16:31 ` Ramkumar Ramachandra
2013-04-15 8:17 ` Matthieu Moy
2013-04-15 9:52 ` Junio C Hamano
2013-04-15 10:58 ` Matthieu Moy
2013-04-15 13:29 ` Ramkumar Ramachandra
2013-04-15 13:45 ` Matthieu Moy
2013-04-15 14:31 ` Ramkumar Ramachandra
2013-04-15 16:17 ` Matthieu Moy
2013-04-15 16:52 ` Ramkumar Ramachandra
2013-04-16 3:09 ` Jonathan Nieder [this message]
2013-04-15 13:15 ` Ramkumar Ramachandra
2013-04-15 13:40 ` Matthieu Moy
2013-04-15 13:56 ` Ramkumar Ramachandra
2013-04-15 15:04 ` Ramkumar Ramachandra
2013-04-15 16:13 ` Matthieu Moy
2013-04-15 16:32 ` Junio C Hamano
2013-04-15 16:45 ` Ramkumar Ramachandra
2013-04-15 16:53 ` John Keeping
2013-04-15 17:05 ` Ramkumar Ramachandra
2013-04-16 3:14 ` Jonathan Nieder
2013-04-16 4:55 ` Ramkumar Ramachandra
2013-04-16 5:26 ` Jonathan Nieder
2013-04-15 15:36 ` Junio C Hamano
2013-04-15 16:38 ` Ramkumar Ramachandra
2013-04-15 17:58 ` Junio C Hamano
2013-04-15 18:08 ` Ramkumar Ramachandra
2013-04-15 18:15 ` John Keeping
2013-04-15 22:17 ` Matthieu Moy
2013-04-16 9:20 ` Ramkumar Ramachandra
2013-04-16 9:44 ` Matthieu Moy
2013-04-16 9:55 ` Ramkumar Ramachandra
2013-04-16 10:36 ` Matthieu Moy
2013-04-16 11:22 ` Matthieu Moy
2013-04-16 17:42 ` Junio C Hamano
2013-04-16 16:50 ` Phil Hord
2013-04-16 20:53 ` 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=20130416030948.GJ3262@elie.Belkin \
--to=jrnieder@gmail.com \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=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).