From: Sverre Rabbelier <srabbelier@gmail.com>
To: Michael Wild <themiwi@users.sourceforge.net>
Cc: git@vger.kernel.org
Subject: Re: conflict status
Date: Mon, 3 Aug 2009 10:37:19 -0700 [thread overview]
Message-ID: <fabb9a1e0908031037t16a828f6h4de9fb11bcc957fe@mail.gmail.com> (raw)
In-Reply-To: <DDAD985F-C9CA-4159-B382-354D4B082C19@users.sourceforge.net>
Heya,
On Mon, Aug 3, 2009 at 08:14, Michael Wild<themiwi@users.sourceforge.net> wrote:
> Generally speaking, I would like to know for each file with a conflict what
> it's status is, similar to what SVN does:
> - locally modified/created/deleted/...
> - remotely modified/created/deleted/...
Try 'git status' :),
--
Cheers,
Sverre Rabbelier
next prev parent reply other threads:[~2009-08-03 17:37 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-03 15:14 conflict status Michael Wild
2009-08-03 17:37 ` Sverre Rabbelier [this message]
2009-08-03 18:17 ` Thomas Rast
2009-08-03 18:35 ` Junio C Hamano
2009-08-04 7:10 ` Michael Wild
2009-08-04 7:19 ` Jakub Narebski
2009-08-04 7:31 ` Michael Wild
2009-08-04 7:56 ` Junio C Hamano
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=fabb9a1e0908031037t16a828f6h4de9fb11bcc957fe@mail.gmail.com \
--to=srabbelier@gmail.com \
--cc=git@vger.kernel.org \
--cc=themiwi@users.sourceforge.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).