public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

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)] git-gui: Reenable staging unmerged files by clicking the icon.
Date: Mon, 22 Sep 2008 09:31:03 +0200	[thread overview]
Message-ID: <48D749B7.9030305@viscovery.net> (raw)
In-Reply-To: <200809201219.18630.angavrilov@gmail.com>

Alexander Gavrilov schrieb:
> This restores functionality of the file icon for unmerged files.
> Safety is enforced by loading the diff and checking for lines
> that look like conflict markers. If such lines are found, or
> the conflict involves deletion and/or symlinks, a confirmation
> dialog is presented. Otherwise, the icon immediately stages the
> working copy version of the file.
> 
> Includes a revert of 2fe5b2ee42897a3acc78e5ddaace3775eb2713ca
> (Restore ability to Stage Working Copy for conflicts)

Thanks, works fine after a brief test:

Tested-by: Johannes Sixt <johannes.sixt@telecom•at>

-- Hannes

next prev parent reply	other threads:[~2008-09-22  7:32 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-09-20  8:19 [PATCH (GIT-GUI)] git-gui: Reenable staging unmerged files by clicking the icon Alexander Gavrilov
2008-09-22  7:31 ` Johannes Sixt [this message]
2008-09-24 18:25 ` Shawn O. Pearce
2008-09-24 19:53   ` Shawn O. Pearce

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=48D749B7.9030305@viscovery.net \
    --to=j.sixt@viscovery$(echo .)net \
    --cc=angavrilov@gmail$(echo .)com \
    --cc=git@vger$(echo .)kernel.org \
    --cc=spearce@spearce$(echo .)org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox