git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Torsten Bögershausen" <tboegi@web.de>
To: git@vger.kernel.org
Cc: tboegi@web.de, eda@waniasset.com, i.grok@comcast.net, pclouds@gmail.com
Subject: [PATCH v2] git-checkout.txt: Document "git checkout <pathspec>" better
Date: Wed, 17 Jun 2015 09:54:51 +0200	[thread overview]
Message-ID: <558127CB.70603@web.de> (raw)

git checkout <pathspec> can be used to reset changes in the working tree.

Signed-off-by: Torsten Bögershausen <tboegi@web.de>
---
Version 2: Try to summarize the suggestions from the mailing list
 Documentation/git-checkout.txt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index d263a56..39ad36f 100644
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -3,7 +3,7 @@ git-checkout(1)
  NAME
 ----
-git-checkout - Checkout a branch or paths to the working tree
+git-checkout - Switch branches or restore changes
  SYNOPSIS
 --------
@@ -89,6 +89,10 @@ Omitting <branch> detaches HEAD at the tip of the current branch.
 	(i.e.  commit, tag or tree) to update the index for the given
 	paths before updating the working tree.
 +
+'git checkout' with <paths> or `--patch` is used to restore modified or
+deleted paths to their original contents from the index or replace paths
+with the contents from a named <tree-ish> (most often a commit-ish).
++
 The index may contain unmerged entries because of a previous failed merge.
 By default, if you try to check out such an entry from the index, the
 checkout operation will fail and nothing will be checked out.
-- 
2.2.0.rc1.790.ge19fcd2

             reply	other threads:[~2015-06-17  7:55 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-17  7:54 Torsten Bögershausen [this message]
2015-06-17  9:58 ` [PATCH v2] git-checkout.txt: Document "git checkout <pathspec>" better Duy Nguyen
2015-06-17 10:54   ` Matthieu Moy
2015-06-17 11:47     ` Andres G. Aragoneses
2015-06-17 11:54       ` Matthieu Moy
2015-06-17 11:56         ` Andres G. Aragoneses
2015-06-17 12:17           ` Matthieu Moy
2015-06-17 15:29             ` Junio C Hamano
2015-06-17 16:12               ` Torsten Bögershausen
2015-06-17 16:19               ` Junio C Hamano
2015-06-17 16:43                 ` Torsten Bögershausen
2015-06-17 17:24                   ` Matthieu Moy
2015-06-17 17:53                     ` Andres G. Aragoneses
2015-06-17 19:24                       ` Junio C Hamano
2015-06-17 19:23                     ` Junio C Hamano
2015-06-17 19:29                       ` Torsten Bögershausen
2015-06-17 19:58                         ` Junio C Hamano
2015-06-18  0:37                           ` Duy Nguyen
2015-06-18  1:07                             ` Junio C Hamano
2015-06-18  7:00                       ` Matthieu Moy

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=558127CB.70603@web.de \
    --to=tboegi@web.de \
    --cc=eda@waniasset.com \
    --cc=git@vger.kernel.org \
    --cc=i.grok@comcast.net \
    --cc=pclouds@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 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).