From: Nanako Shiraishi <nanako3@lavabit.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 2/3] commit/status: "git add <path>" is not necessarily how to resolve
Date: Sat, 12 Dec 2009 18:19:25 +0900 [thread overview]
Message-ID: <20091212181925.6117@nanako3.lavabit.com> (raw)
In-Reply-To: <1260608523-15579-3-git-send-email-gitster@pobox.com>
Quoting Junio C Hamano <gitster@pobox.com>
> # On branch side
> # Unmerged paths:
> # (use "git reset HEAD <file>..." to unstage)
> -# (use "git add <file>..." to mark resolution)
> +# (use "git add/rm <file>..." as appropriately to mark resolution)
Shouldn't this either be "as appropriate" or just "appropriately"?
--
Nanako Shiraishi
http://ivory.ap.teacup.com/nanako3/
next prev parent reply other threads:[~2009-12-12 9:20 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-10 23:56 How to selectively recreate merge state? Jay Soffian
2009-12-11 0:04 ` Junio C Hamano
2009-12-11 0:28 ` Jakub Narebski
2009-12-11 1:11 ` Junio C Hamano
2009-12-11 1:33 ` Jakub Narebski
2009-12-11 10:44 ` Michael J Gruber
2009-12-11 11:09 ` Björn Steinbrink
2009-12-11 12:51 ` Thomas Rast
2009-12-11 11:20 ` Jakub Narebski
2009-12-11 12:33 ` Michael J Gruber
2009-12-11 14:00 ` Jakub Narebski
2009-12-11 14:57 ` Michael J Gruber
2009-12-11 15:35 ` Junio C Hamano
2009-12-11 19:24 ` Junio C Hamano
2009-12-11 22:18 ` Jay Soffian
2009-12-11 23:46 ` Junio C Hamano
2009-12-12 9:02 ` [PATCH 0/3] Update advice in commit/status output Junio C Hamano
2009-12-12 9:02 ` [PATCH 1/3] commit/status: check $GIT_DIR/MERGE_HEAD only once Junio C Hamano
2009-12-12 9:02 ` [PATCH 2/3] commit/status: "git add <path>" is not necessarily how to resolve Junio C Hamano
2009-12-12 9:02 ` [PATCH 3/3] status/commit: do not suggest "reset HEAD <path>" while merging Junio C Hamano
2009-12-12 9:15 ` [PATCH 2/3] commit/status: "git add <path>" is not necessarily how to resolve Jeff King
2009-12-12 9:24 ` Junio C Hamano
2009-12-12 9:19 ` Nanako Shiraishi [this message]
2009-12-12 16:13 ` [PATCH 0/3] Update advice in commit/status output Sverre Rabbelier
2009-12-12 18:27 ` Junio C Hamano
2009-12-12 22:06 ` Jay Soffian
2009-12-11 20:38 ` How to selectively recreate merge state? Paolo Bonzini
2009-12-11 21:14 ` 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=20091212181925.6117@nanako3.lavabit.com \
--to=nanako3@lavabit.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.