From: picca <picca@synchrotron-soleil.Fr>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: Re: newby question about merge.
Date: Wed, 16 May 2007 08:33:35 +0200 [thread overview]
Message-ID: <20070516083335.106667c5@localhost.localdomain> (raw)
In-Reply-To: <7vabw5iws8.fsf@assigned-by-dhcp.cox.net>
On Tue, 15 May 2007 14:47:51 -0700
Junio C Hamano <junkio@cox.net> wrote:
> picca <picca@synchrotron-soleil.Fr> writes:
>
> > Is it possible to add this git cat-file -p :2:filename > filename in
> > the man page of git-merge in the resolve conflict part ?
> >
> > Or a link to the documentation speaking of this stage part.
>
> See:
>
> http://www.kernel.org/pub/software/scm/git/docs/user-manual.html#conflict-resolution
>
> As this walk through section from the user manual's already
> talks about it, I am not sure if we would want to duplicate its
> wording in git-merge manual page.
I had already red this manual but did not catch up that the :2:configure
was the git path of the files I want to retreive. In fact I was missing
the git-cat-file part and the git path.
regards, frederic
next prev parent reply other threads:[~2007-05-16 6:33 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-05-15 9:38 newby question about merge picca
2007-05-15 10:25 ` Alex Riesen
2007-05-15 10:34 ` Jakub Narebski
2007-05-15 11:37 ` picca
2007-05-15 21:47 ` Junio C Hamano
2007-05-16 6:33 ` picca [this message]
2007-05-16 11:43 ` Johannes Schindelin
2007-05-16 14:21 ` Christian MICHON
2007-05-16 14:45 ` Johannes Schindelin
2007-05-16 19:35 ` Christian MICHON
2007-05-16 22:39 ` 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=20070516083335.106667c5@localhost.localdomain \
--to=picca@synchrotron-soleil.fr \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/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).