git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Christian Couder <chriscool@tuxfamily.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org,
	Johannes Schindelin <Johannes.Schindelin@gmx.de>,
	Sverre Rabbelier <srabbelier@gmail.com>,
	Ramkumar Ramachandra <artagnon@gmail.com>,
	Jonathan Nieder <jrnieder@gmail.com>
Subject: [PATCH 8/8] Documentation/revert: describe passing more than one commit
Date: Mon, 31 May 2010 21:42:39 +0200	[thread overview]
Message-ID: <20100531194240.28729.15284.chriscool@tuxfamily.org> (raw)
In-Reply-To: <20100531193359.28729.55562.chriscool@tuxfamily.org>

And while at it, add an "Examples" section.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
 Documentation/git-revert.txt |   52 ++++++++++++++++++++++++++++-------------
 1 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/Documentation/git-revert.txt b/Documentation/git-revert.txt
index c66bf80..5740f37 100644
--- a/Documentation/git-revert.txt
+++ b/Documentation/git-revert.txt
@@ -3,20 +3,22 @@ git-revert(1)
 
 NAME
 ----
-git-revert - Revert an existing commit
+git-revert - Revert some existing commits
 
 SYNOPSIS
 --------
-'git revert' [--edit | --no-edit] [-n] [-m parent-number] [-s] <commit>
+'git revert' [--edit | --no-edit] [-n] [-m parent-number] [-s] <commit>...
 
 DESCRIPTION
 -----------
-Given one existing commit, revert the change the patch introduces, and record a
-new commit that records it.  This requires your working tree to be clean (no
-modifications from the HEAD commit).
 
-Note: 'git revert' is used to record a new commit to reverse the
-effect of an earlier commit (often a faulty one).  If you want to
+Given one or more existing commits, revert the changes that the
+related patches introduce, and record some new commits that record
+them.  This requires your working tree to be clean (no modifications
+from the HEAD commit).
+
+Note: 'git revert' is used to record some new commits to reverse the
+effect of some earlier commits (often only a faulty one).  If you want to
 throw away all uncommitted changes in your working directory, you
 should see linkgit:git-reset[1], particularly the '--hard' option.  If
 you want to extract specific files as they were in another commit, you
@@ -26,10 +28,13 @@ both will discard uncommitted changes in your working directory.
 
 OPTIONS
 -------
-<commit>::
-	Commit to revert.
+<commit>...::
+	Commits to revert.
 	For a more complete list of ways to spell commit names, see
 	"SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1].
+	Sets of commits can also be given but no traversal is done by
+	default, see linkgit:git-rev-list[1] and its '--no-walk'
+	option.
 
 -e::
 --edit::
@@ -59,14 +64,13 @@ more details.
 
 -n::
 --no-commit::
-	Usually the command automatically creates a commit with
-	a commit log message stating which commit was
-	reverted.  This flag applies the change necessary
-	to revert the named commit to your working tree
-	and the index, but does not make the commit.  In addition,
-	when this option is used, your index does not have to match
-	the HEAD commit.  The revert is done against the
-	beginning state of your index.
+	Usually the command automatically creates some commits with
+	commit log messages stating which commits were reverted.  This
+	flag applies the changes necessary to revert the named commits
+	to your working tree and the index, but does not make the
+	commits.  In addition, when this option is used, your index
+	does not have to match the HEAD commit.  The revert is done
+	against the beginning state of your index.
 +
 This is useful when reverting more than one commits'
 effect to your index in a row.
@@ -75,6 +79,20 @@ effect to your index in a row.
 --signoff::
 	Add Signed-off-by line at the end of the commit message.
 
+Examples
+--------
+git revert HEAD~3::
+
+	Revert the changes specified by the fourth last commit in HEAD
+	and create a new commit with the reverted changes.
+
+git revert -n master\~5..master~2::
+
+	Revert the changes done by commits from the fiveth last commit
+	in master (included) to the third last commit in master
+	(included), but do not create any commit with the reverted
+	changes. The revert only modifies the working tree and the
+	index.
 
 Author
 ------
-- 
1.7.1.361.g42de.dirty

  parent reply	other threads:[~2010-06-01  3:05 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-05-31 19:42 [PATCH 0/8] implement cherry-picking many commits Christian Couder
2010-05-31 19:42 ` [PATCH 1/8] revert: cleanup code for -x option Christian Couder
2010-05-31 19:42 ` [PATCH 2/8] revert: use run_command_v_opt() instead of execv_git_cmd() Christian Couder
2010-06-01  4:01   ` Jonathan Nieder
2010-06-01  4:33     ` Christian Couder
2010-05-31 19:42 ` [PATCH 3/8] revert: refactor code into a do_pick_commit() function Christian Couder
2010-05-31 19:42 ` [PATCH 4/8] revert: change help_msg() to take no argument Christian Couder
2010-06-01  5:08   ` Jonathan Nieder
2010-06-01  5:40     ` Jeff King
2010-06-01  6:27       ` Jonathan Nieder
2010-05-31 19:42 ` [PATCH 5/8] revert: allow cherry-picking more than one commit Christian Couder
2010-06-01  7:38   ` Sverre Rabbelier
2010-06-01  8:35   ` Jonathan Nieder
2010-06-02 23:37     ` Junio C Hamano
2010-06-03  4:18       ` Christian Couder
2010-06-01  9:03   ` Jonathan Nieder
2010-06-02  5:57     ` Christian Couder
2010-05-31 19:42 ` [PATCH 6/8] revert: add tests to check cherry-picking many commits Christian Couder
2010-05-31 19:42 ` [PATCH 7/8] Documentation/cherry-pick: describe passing more than one commit Christian Couder
2010-06-01  9:29   ` Ramkumar Ramachandra
2010-06-02  5:57     ` Christian Couder
2010-06-01  9:51   ` Jonathan Nieder
2010-06-01 10:26     ` Ramkumar Ramachandra
2010-06-02  5:57       ` Christian Couder
2010-06-02  5:57     ` Christian Couder
2010-06-02  6:14       ` Jonathan Nieder
2010-06-14  3:33         ` Christian Couder
2010-05-31 19:42 ` Christian Couder [this message]
2010-06-01 13:28   ` [PATCH 8/8] Documentation/revert: " Antriksh Pany
2010-06-02  5:57     ` Christian Couder

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=20100531194240.28729.15284.chriscool@tuxfamily.org \
    --to=chriscool@tuxfamily.org \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=artagnon@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jrnieder@gmail.com \
    --cc=srabbelier@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).