all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Eli Zaretskii <eliz@gnu.org>
To: Dmitry Gutov <dgutov@yandex.ru>
Cc: monnier@IRO.UMontreal.CA, emacs-devel@gnu.org
Subject: Re: [Emacs-diffs] master b5b0e05: Call `smerge-start-session'	even when dealing with a stash conflict
Date: Mon, 20 Apr 2015 17:54:29 +0300	[thread overview]
Message-ID: <83bnii6eai.fsf@gnu.org> (raw)
In-Reply-To: <5534FB9D.4070502@yandex.ru>

> Date: Mon, 20 Apr 2015 16:14:05 +0300
> From: Dmitry Gutov <dgutov@yandex.ru>
> 
> > Or better yet, do the "mark as resolved" differently, which doesn't
> > involved touching the "staging area".  Not sure how to do that, but Git
> > aficionados should be able to find some clever hack for that, involving
> > less than 10 commands.
> 
> Guess I'm not enough of an aficionado, then. After plenty of searching 
> and reading the man pages, 'git add' followed by 'git reset' is the best 
> I have.

AFAIU, "git add" is not needed, "git reset HEAD FILE" is enough.



  parent reply	other threads:[~2015-04-20 14:54 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20150419192734.3632.17817@vcs.savannah.gnu.org>
     [not found] ` <E1YjusQ-0000xG-6u@vcs.savannah.gnu.org>
2015-04-20  2:48   ` [Emacs-diffs] master b5b0e05: Call `smerge-start-session' even when dealing with a stash conflict Stefan Monnier
2015-04-20 13:14     ` Dmitry Gutov
2015-04-20 13:35       ` Dmitry Gutov
2015-04-20 14:54       ` Eli Zaretskii [this message]
2015-04-20 15:25       ` Stefan Monnier
2015-04-20 15:54         ` Dmitry Gutov
2015-04-20 19:39           ` Stefan Monnier
2015-04-20 21:06             ` Dmitry Gutov
2015-04-20 14:46     ` Eli Zaretskii

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=83bnii6eai.fsf@gnu.org \
    --to=eliz@gnu.org \
    --cc=dgutov@yandex.ru \
    --cc=emacs-devel@gnu.org \
    --cc=monnier@IRO.UMontreal.CA \
    /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 external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.