From: Elijah Newren <newren@gmail.com>
To: layer <layer@known.net>
Cc: git@vger.kernel.org
Subject: Re: need help with git show :1:...
Date: Wed, 8 Apr 2009 12:38:06 -0600 [thread overview]
Message-ID: <51419b2c0904081138o3f05a6fm6a4213e7b0f1db6f@mail.gmail.com> (raw)
In-Reply-To: <7685.1239215733@relay.known.net>
Hi,
On Wed, Apr 8, 2009 at 12:35 PM, layer <layer@known.net> wrote:
<snip>
>>> git merge-file current-sock other-sock base-sock
>
> Did you mean this?
>
> git merge-file current-sock base-sock other-sock
>
> The man page seems to indicate that.
Oops, yeah, current then base then other, like the manpage says.
next prev parent reply other threads:[~2009-04-08 18:39 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-08 17:41 need help with git show :1: layer
2009-04-08 17:58 ` Elijah Newren
2009-04-08 18:02 ` layer
2009-04-08 18:07 ` Elijah Newren
2009-04-08 18:10 ` layer
2009-04-08 18:25 ` Elijah Newren
2009-04-08 18:35 ` layer
2009-04-08 18:38 ` Elijah Newren [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-04-08 17:57 layer
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=51419b2c0904081138o3f05a6fm6a4213e7b0f1db6f@mail.gmail.com \
--to=newren@gmail.com \
--cc=git@vger.kernel.org \
--cc=layer@known.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).