From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel 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 Message-ID: <83bnii6eai.fsf@gnu.org> References: <20150419192734.3632.17817@vcs.savannah.gnu.org> <5534FB9D.4070502@yandex.ru> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1429541694 23578 80.91.229.3 (20 Apr 2015 14:54:54 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 20 Apr 2015 14:54:54 +0000 (UTC) Cc: monnier@IRO.UMontreal.CA, emacs-devel@gnu.org To: Dmitry Gutov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Apr 20 16:54:44 2015 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1YkD5w-0000vc-1U for ged-emacs-devel@m.gmane.org; Mon, 20 Apr 2015 16:54:44 +0200 Original-Received: from localhost ([::1]:54019 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YkD5v-0002uh-7D for ged-emacs-devel@m.gmane.org; Mon, 20 Apr 2015 10:54:43 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39157) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YkD5s-0002uc-6b for emacs-devel@gnu.org; Mon, 20 Apr 2015 10:54:41 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YkD5p-0006P1-HR for emacs-devel@gnu.org; Mon, 20 Apr 2015 10:54:40 -0400 Original-Received: from mtaout25.012.net.il ([80.179.55.181]:43342) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YkD5p-0006Nd-A3 for emacs-devel@gnu.org; Mon, 20 Apr 2015 10:54:37 -0400 Original-Received: from conversion-daemon.mtaout25.012.net.il by mtaout25.012.net.il (HyperSendmail v2007.08) id <0NN400J000XP5D00@mtaout25.012.net.il> for emacs-devel@gnu.org; Mon, 20 Apr 2015 17:50:16 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout25.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NN400K4P17REB00@mtaout25.012.net.il>; Mon, 20 Apr 2015 17:50:16 +0300 (IDT) In-reply-to: <5534FB9D.4070502@yandex.ru> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.181 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:185705 Archived-At: > Date: Mon, 20 Apr 2015 16:14:05 +0300 > From: Dmitry Gutov > > > 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.