From: Jon Smirl <jonsmirl@gmail.com>
To: Git Mailing List <git@vger.kernel.org>
Subject: diff: unmerged path?
Date: Mon, 30 Mar 2009 22:47:15 -0400 [thread overview]
Message-ID: <9e4733910903301947g20ade881q6a49f9cd8731b8f4@mail.gmail.com> (raw)
What does it mean when I have an unmerged path?
jonsmirl@terra:/home/apps/u-boot$ git diff
* Unmerged path api_examples/intellon.c
jonsmirl@terra:/home/apps/u-boot$
api_examples/intellon.c is a newly created file under stgit.
--
Jon Smirl
jonsmirl@gmail.com
reply other threads:[~2009-03-31 2:48 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=9e4733910903301947g20ade881q6a49f9cd8731b8f4@mail.gmail.com \
--to=jonsmirl@gmail.com \
--cc=git@vger.kernel.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 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).