From: Bruno Haible <bruno@clisp.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: suggestion for git stash
Date: Sun, 30 Sep 2007 22:59:11 +0200 [thread overview]
Message-ID: <200709302259.11731.bruno@clisp.org> (raw)
In-Reply-To: <7vfy0vhqkl.fsf@gitster.siamese.dyndns.org>
Junio C Hamano wrote:
> Isn't "stash apply --index" what you talk about?
Not really:
$ git status
# On branch master
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# modified: README
#
# Changed but not updated:
# (use "git add <file>..." to update what will be committed)
#
# modified: NEWS
#
$ git stash
Saved "WIP on master: 61135ee... Use check_PROGRAMS instead of noinst_PROGRAMS."
HEAD is now at 61135ee... Use check_PROGRAMS instead of noinst_PROGRAMS.
$ git stash apply --index
error: No changes
Conflicts in index. Try without --index.
(This is git version 1.5.3.1.)
I don't know what "git stash apply --index" does, since it's not documented.
Bruno
next prev parent reply other threads:[~2007-09-30 20:59 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-30 18:50 suggestion for git stash Bruno Haible
2007-09-30 19:59 ` Junio C Hamano
2007-09-30 20:28 ` Matthieu Moy
2007-09-30 20:59 ` Bruno Haible [this message]
2007-09-30 21:29 ` Johannes Schindelin
2007-09-30 22:30 ` [PATCH] git stash: document apply's --index switch Miklos Vajna
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=200709302259.11731.bruno@clisp.org \
--to=bruno@clisp.org \
--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).