From: Alexander Gavrilov <angavrilov@gmail.com>
To: Johannes Sixt <j.sixt@viscovery.net>
Cc: "Shawn O. Pearce" <spearce@spearce.org>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH] git-gui: Do not automatically stage file after merge tool finishes
Date: Tue, 30 Sep 2008 12:00:57 +0400 [thread overview]
Message-ID: <200809301200.57353.angavrilov@gmail.com> (raw)
In-Reply-To: <48E1CA7F.5050501@viscovery.net>
On Tuesday 30 September 2008 10:43:11 Johannes Sixt wrote:
> From: Johannes Sixt <johannes.sixt@telecom.at>
>
> If a merge tool was invoked on a conflicted file and the tool completed,
> then the conflicted file was staged automatically. However, the fact that
> the user closed the merge tool cannot be understood as the unequivocal
> sign that the conflict was completely resolved. For example, the user
> could have decided to postpone the resolution of the conflict, or could
> have accidentally closed the tool. We better leave the file unstaged and
> let the user stage it explicitly.
>
> Since the file is not staged anyway, the check for an unmodified
> timestamp is pointless and removed.
>
> Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
> ---
> I had sent this patch last week (but marked as RFC). Here it is again
> without 'RFC' because I think it is a necessary change.
Now that the issue with staging of working copy files is more or less
resolved, I agree that it is better to disable automatic staging.
Alexander
prev parent reply other threads:[~2008-09-30 8:03 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-30 6:43 [PATCH] git-gui: Do not automatically stage file after merge tool finishes Johannes Sixt
2008-09-30 8:00 ` Alexander Gavrilov [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=200809301200.57353.angavrilov@gmail.com \
--to=angavrilov@gmail.com \
--cc=git@vger.kernel.org \
--cc=j.sixt@viscovery.net \
--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).