From: Johannes Sixt <j.sixt@viscovery.net>
To: Alexander Gavrilov <angavrilov@gmail.com>
Cc: git@vger.kernel.org, "Shawn O. Pearce" <spearce@spearce.org>
Subject: Re: [PATCH (GIT-GUI FIX)] git-gui: Restore ability to Stage Working Copy for conflicts.
Date: Tue, 09 Sep 2008 08:18:40 +0200 [thread overview]
Message-ID: <48C61540.8070300@viscovery.net> (raw)
In-Reply-To: <200809082037.12173.angavrilov@gmail.com>
Alexander Gavrilov schrieb:
> Tools like rerere leave files marked as conflicts in the index,
> while actually resolving them in the working copy. Also, some
> people like to use an external editor to resolve conflicts.
>
> This patch restores functionality previously removed in
> commit 617ceee653 by adding a new context menu item.
> It still ensures that the user does not stage conflicting files
> accidentally by clicking on the icon instead of the name.
Thanks! Works well here.
Tested-by: Johannes Sixt <johannes.sixt@telecom.at>
-- Hannes
prev parent reply other threads:[~2008-09-09 6:19 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-08 16:37 [PATCH (GIT-GUI FIX)] git-gui: Restore ability to Stage Working Copy for conflicts Alexander Gavrilov
2008-09-09 6:18 ` Johannes Sixt [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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=48C61540.8070300@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=angavrilov@gmail.com \
--cc=git@vger.kernel.org \
--cc=spearce@spearce.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.
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).