From: layer <layer@known.net>
To: Elijah Newren <newren@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: need help with git show :1:...
Date: Wed, 08 Apr 2009 11:02:42 -0700 [thread overview]
Message-ID: <7199.1239213762@relay.known.net> (raw)
In-Reply-To: <51419b2c0904081058p7d5a56c3j6aa5cebb0188ad43@mail.gmail.com>
Elijah Newren <newren@gmail.com> wrote:
>> Does the file have conflicts? Try
>> git ls-files -s src/c/sock.c
Yes, it did have conflicts. I resolved the conflicts via editing, but
want to look at the other versions before finalizing the edits.
quadra% git ls-files -s src/c/sock.c
100644 ef6c9b94c678dc79760edfd15a0796b3726b76f6 0 src/c/sock.c
quadra%
Elijah, thanks for replying.
next prev parent reply other threads:[~2009-04-08 18:04 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 [this message]
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
-- 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=7199.1239213762@relay.known.net \
--to=layer@known.net \
--cc=git@vger.kernel.org \
--cc=newren@gmail.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 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.