git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Andreas Ericsson <ae@op5.se>
To: Matthieu Moy <Matthieu.Moy@imag.fr>
Cc: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>,
	Johannes Schindelin <Johannes.Schindelin@gmx.de>,
	Nguyen Thai Ngoc Duy <pclouds@gmail.com>,
	Wincent Colaiuta <win@wincent.com>,
	Git Mailing List <git@vger.kernel.org>
Subject: Re: Question about "git commit -a"
Date: Fri, 05 Oct 2007 14:17:16 +0200	[thread overview]
Message-ID: <47062B4C.5090503@op5.se> (raw)
In-Reply-To: <vpqsl4piykb.fsf@bauges.imag.fr>

Matthieu Moy wrote:
> Andreas Ericsson <ae@op5.se> writes:
> 
>>>> or check which merge- conflicts you've already resolved,
>>> At least bzr and baz have this kind of conflict management. It's just
>>> a separate file, containing the list of unresolved conflicts.
>> Can you check them against any revision you want? If so, I'm
>> impressed :)
> 
> If you mean s/check/diff/, not in a simple way, no. Otherwise, I don't
> understand what you mean by "check merge-conflicts you've already
> resolved against any revision".
> 

Actually, I meant "diff the staged area against any random commit". It's
really nice to do after a bisect, where you know what the bad commit looks
like, and how the code changed to introduce the bug.

-- 
Andreas Ericsson                   andreas.ericsson@op5.se
OP5 AB                             www.op5.se
Tel: +46 8-230225                  Fax: +46 8-230231

  reply	other threads:[~2007-10-05 12:17 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-10-04 15:38 Question about "git commit -a" Paolo Ciarrocchi
2007-10-04 15:43 ` Matthieu Moy
2007-10-04 15:48   ` Paolo Ciarrocchi
2007-10-04 15:58 ` Wincent Colaiuta
2007-10-04 20:33   ` Nguyen Thai Ngoc Duy
2007-10-04 21:10     ` Johannes Schindelin
2007-10-04 21:16       ` Nguyen Thai Ngoc Duy
2007-10-04 21:26       ` Shawn O. Pearce
2007-10-05  8:39       ` Paolo Ciarrocchi
2007-10-05  8:52         ` Andreas Ericsson
2007-10-05  9:06           ` Paolo Ciarrocchi
2007-10-05 10:02             ` Andreas Ericsson
2007-10-05 10:11               ` Matthieu Moy
2007-10-05 10:14                 ` Andreas Ericsson
2007-10-05 11:35                   ` Matthieu Moy
2007-10-05 12:17                     ` Andreas Ericsson [this message]
2007-10-05 12:19               ` Paolo Ciarrocchi
2007-10-05 12:23                 ` Andreas Ericsson
2007-10-05 12:45                   ` Matthieu Moy
2007-10-05 15:56           ` Kristian Høgsberg
2007-10-05 16:33             ` Matthieu Moy
2007-10-05 18:16             ` Marko Macek
2007-10-06  7:43               ` Andy Parkins
2007-10-06 16:13                 ` Linus Torvalds
2007-10-07 12:26               ` Wincent Colaiuta
2007-10-05 21:10             ` Dmitry Potapov
2007-10-07  6:12               ` Marko Macek
2007-10-07 14:50                 ` Dmitry Potapov
2007-10-07 16:26                 ` Johannes Schindelin
2007-10-05 10:48         ` Wincent Colaiuta
2007-10-04 21:25 ` Andy Parkins
2007-10-05  6:04   ` Miles Bader
2007-10-04 22:34 ` David Soria
2007-10-04 23:03   ` Alex Riesen
2007-10-04 23:19   ` Johannes Schindelin

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=47062B4C.5090503@op5.se \
    --to=ae@op5.se \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=Matthieu.Moy@imag.fr \
    --cc=git@vger.kernel.org \
    --cc=paolo.ciarrocchi@gmail.com \
    --cc=pclouds@gmail.com \
    --cc=win@wincent.com \
    /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).