From: Miles Bader <miles@gnu.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: Nanako Shiraishi <nanako3@lavabit.com>, git@vger.kernel.org
Subject: Re: [PATCH] stash: --keep option just saves
Date: Thu, 12 Feb 2009 14:01:37 +0900 [thread overview]
Message-ID: <buovdrgckpa.fsf@dhlpc061.dev.necel.com> (raw)
In-Reply-To: <7vljscbp60.fsf@gitster.siamese.dyndns.org> (Junio C. Hamano's message of "Wed, 11 Feb 2009 14:10:31 -0800")
Junio C Hamano <gitster@pobox.com> writes:
> This one, the "snapshot", and various other related topics, are quite
> different. The workflow the --keep (and for that matter, "snapshot")
> would support I can think of does not sound a very good one we would want
> to recommend (--untracked is a different issue; I haven't formed an
> opinion).
>
> You build on a branch, but you are forever in the state of indecision, and
> instead of committing, you keep saying "save --keep" number of times to
> leave a checkpoint on your stash. After number of iterations, you may
> have many stashes in "git stash list", but what you can do with them is
> "git reset --hard && git stash apply stash@{$n}" to go back to any of the
> state, but that is about it.
Yeah, but that's a pretty useful thing.
I often save checkpoints of my working state before starting a
tentative/intrusive series of edits -- if they are clearly just part
of a larger logical change, I may not want to make separate commits
[or perhaps more commonly, I'm not entirely sure what the final commit
will be like, and am still "exploring"].
Of course this can also be done in git by doing temporary commits
(to be changed later with --amend, or rolled back before making the
real commit), or whatever, but I think pretty much every usage of
git-stash can be done fairly easily via some other means in git;
git-stash is really just a convenience.
-miles
--
Politeness, n. The most acceptable hypocrisy.
next prev parent reply other threads:[~2009-02-12 5:04 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-11 21:25 [PATCH] stash: --keep option just saves Nanako Shiraishi
2009-02-11 22:10 ` Junio C Hamano
2009-02-12 5:01 ` Miles Bader [this message]
2009-02-12 8:17 ` Nanako Shiraishi
2009-02-12 8:28 ` Miles Bader
2009-02-12 8:17 ` Nanako Shiraishi
2009-02-12 21:04 ` Junio C Hamano
2009-02-13 7:07 ` Björn Steinbrink
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=buovdrgckpa.fsf@dhlpc061.dev.necel.com \
--to=miles@gnu.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=nanako3@lavabit.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).