From: Florian Weimer <fweimer@bfk.de>
To: "Shawn O. Pearce" <spearce@spearce.org>
Cc: Jeff King <peff@peff.net>, Steven Grimm <koreth@midwinter.com>,
Junio C Hamano <gitster@pobox.com>,
Chris Shoemaker <c.shoemaker@cox.net>,
git@vger.kernel.org, Alex Riesen <raa.lkml@gmail.com>,
Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: Re: [PATCH] Document what the stage numbers in the :$n:path syntax mean.
Date: Mon, 20 Aug 2007 09:15:01 +0200 [thread overview]
Message-ID: <828x86ad8q.fsf@mid.bfk.de> (raw)
In-Reply-To: <20070820061330.GB27913@spearce.org> (Shawn O. Pearce's message of "Mon, 20 Aug 2007 02:13:30 -0400")
* Shawn O. Pearce:
>> I've memorized it long long ago. But my coworkers haven't and always
>> get it wrong, and look at me funny when I tell them "trust me, your
>> data is in stage 2 and theirs is in stage 3... because that's the
>> convention all of the tools you are using follows".
>
> Actually, what's wrong with the following:
>
> git show HEAD:foo.c
> git show MERGE_HEAD:foo.c
>
> ?
I think that in the staged versions, the non-conflicting parts of the
merge are in fact merged. For the HEAD/MERGE_HEAD versions, this
isn't the case, obviously.
--
Florian Weimer <fweimer@bfk.de>
BFK edv-consulting GmbH http://www.bfk.de/
Kriegsstraße 100 tel: +49-721-96201-1
D-76133 Karlsruhe fax: +49-721-96201-99
next prev parent reply other threads:[~2007-08-20 7:15 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-14 22:33 merge-recursive: do not rudely die on binary merge Junio C Hamano
2007-08-14 23:14 ` Chris Shoemaker
2007-08-15 0:07 ` Junio C Hamano
2007-08-15 11:19 ` Nikodemus Siivola
2007-08-15 11:50 ` Junio C Hamano
2007-08-20 3:36 ` [PATCH] Document what the stage numbers in the :$n:path syntax mean Steven Grimm
2007-08-20 5:52 ` Jeff King
2007-08-20 6:05 ` Shawn O. Pearce
2007-08-20 6:13 ` Shawn O. Pearce
2007-08-20 7:15 ` Florian Weimer [this message]
2007-08-20 8:04 ` Jeff King
2007-08-20 6:30 ` Junio C Hamano
2007-08-20 6:44 ` Jeff King
2007-08-22 0:14 ` Jakub Narebski
2007-08-20 6:37 ` Jeff King
2007-08-20 9:55 ` [PATCH] Document what the stage numbers in the :$n:path syntaxmean Johannes Sixt
2007-08-20 6:20 ` [PATCH] Document what the stage numbers in the :$n:path syntax mean Junio C Hamano
2007-08-20 18:08 ` Jan Hudec
2007-08-20 19:55 ` Junio C Hamano
2007-08-15 0:09 ` merge-recursive: do not rudely die on binary merge Junio C Hamano
2007-08-15 0:18 ` Chris Larson
2007-08-15 1:16 ` Chris Shoemaker
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=828x86ad8q.fsf@mid.bfk.de \
--to=fweimer@bfk.de \
--cc=c.shoemaker@cox.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
--cc=koreth@midwinter.com \
--cc=peff@peff.net \
--cc=raa.lkml@gmail.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.