From: "J. Bruce Fields" <bfields@fieldses.org>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: [PATCH] git-commit.txt: better warning about -f option
Date: Tue, 17 Apr 2007 09:59:03 -0400 [thread overview]
Message-ID: <20070417135903.GF11907@fieldses.org> (raw)
In-Reply-To: <20070417135812.GE11907@fieldses.org>
Make sure the reader understands that -f may cause the loss of any local
changes.
Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
---
Documentation/git-checkout.txt | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index 337b3d5..7aa877f 100644
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -39,7 +39,7 @@ OPTIONS
-f::
Proceed even if the index or the working tree differs
- from HEAD.
+ from HEAD, possibly overwriting and losing any local changes.
-b::
Create a new branch named <new_branch> and start it at
--
1.5.1.1.98.gedb4f
next prev parent reply other threads:[~2007-04-17 13:59 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <11766982362087-git-send-email->
2007-04-16 4:37 ` [PATCH 1/7] Documentation: minor edits of git-lost-found manpage J. Bruce Fields
[not found] ` <11766982361830-git-send-email->
2007-04-16 4:37 ` [PATCH 2/7] Documentation: clarify git-checkout -f, minor editing J. Bruce Fields
2007-04-16 5:13 ` Junio C Hamano
2007-04-17 13:58 ` J. Bruce Fields
2007-04-17 13:59 ` J. Bruce Fields [this message]
[not found] ` <1176698236722-git-send-email->
2007-04-16 4:37 ` [PATCH 3/7] Documentation: clarify track/no-track option J. Bruce Fields
[not found] ` <11766982363767-git-send-email->
2007-04-16 4:37 ` [PATCH 4/7] user-manual: fix discussion of default clone J. Bruce Fields
[not found] ` <11766982363276-git-send-email->
2007-04-16 4:37 ` [PATCH 5/7] user-manual: detached HEAD J. Bruce Fields
[not found] ` <11766982362066-git-send-email->
2007-04-16 4:37 ` [PATCH 6/7] user-manual: start revising "internals" chapter J. Bruce Fields
[not found] ` <11766982362911-git-send-email->
2007-04-16 4:37 ` [PATCH 7/7] user-manual: use detached head when rewriting history J. Bruce Fields
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=20070417135903.GF11907@fieldses.org \
--to=bfields@fieldses.org \
--cc=git@vger.kernel.org \
--cc=junkio@cox.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).