From: "Renaud Casenave-Péré" <renaud@casenave-pere.fr>
To: Mike Gerwitz <mtg@gnu.org>
Cc: Alan Mackenzie <acm@muc.de>, Eli Zaretskii <eliz@gnu.org>,
emacs-devel@gnu.org
Subject: Re: Git help requested: "git stash pop" is doing an unwanted "git add". Why?
Date: Tue, 22 Dec 2015 17:11:44 +0100 [thread overview]
Message-ID: <rkkk37uupinz.fsf@casenave-pere.fr> (raw)
In-Reply-To: <87egeexzqy.fsf@gnu.org> (Mike Gerwitz's message of "Tue, 22 Dec 2015 10:35:33 -0500")
In my experience, if some files are in conflict, git will add to index all
non-conflicting files to clearly separate the conflicting ones.
You are then expected to resolve the conflicts, stage the files to tell git to
accept the resolved files, and do a git reset to put everything back in the
working area.
I think this is something that is not (properly) documented and quite confusing
but when you know what to do, you get used to it…
--
Renaud Casenave-Péré
prev parent reply other threads:[~2015-12-22 16:11 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-20 22:01 Git help requested: "git stash pop" is doing an unwanted "git add". Why? Alan Mackenzie
2015-12-20 22:48 ` David Kastrup
2015-12-20 23:04 ` Alan Mackenzie
2015-12-21 3:35 ` Eli Zaretskii
2015-12-21 20:26 ` Alan Mackenzie
2015-12-22 15:35 ` Mike Gerwitz
2015-12-22 16:11 ` Renaud Casenave-Péré [this message]
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=rkkk37uupinz.fsf@casenave-pere.fr \
--to=renaud@casenave-pere.fr \
--cc=acm@muc.de \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=mtg@gnu.org \
/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.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).