[PATCH] git-commit: Only describe --dry-run once

[PATCH] git-commit: Only describe --dry-run once

[Johannes Gilger]

Junio described the option in 3a5d13a and then again in 60c2993.
Also fix a small typo in the documentation for git-clone.

Signed-off-by: Johannes Gilger <heipei@hackvalue.de>
---
 Documentation/git-clone.txt  |    2 +-
 Documentation/git-commit.txt |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt
index f23100e..aacf4fd 100644
--- a/Documentation/git-clone.txt
+++ b/Documentation/git-clone.txt
@@ -130,7 +130,7 @@ objects from the source repository into a pack in the cloned repository.
 --branch <name>::
 -b <name>::
 	Instead of pointing the newly created HEAD to the branch pointed
-	to by the cloned repositoroy's HEAD, point to <name> branch
+	to by the cloned repository's HEAD, point to <name> branch
 	instead. In a non-bare repository, this is the branch that will
 	be checked out.
 
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 64f94cf..b2817b4 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -8,7 +8,7 @@ git-commit - Record changes to the repository
 SYNOPSIS
 --------
 [verse]
-'git commit' [-a | --interactive] [-s] [-v] [-u<mode>] [--amend] [--dry-run]
+'git commit' [-a | --interactive] [-s] [-v] [-u<mode>] [--amend]
 	   [(-c | -C) <commit>] [-F <file> | -m <msg>] [--dry-run]
 	   [--allow-empty] [--no-verify] [-e] [--author=<author>]
 	   [--cleanup=<mode>] [--] [[-i | -o ]<file>...]
-- 
1.6.5.rc1

Re: [PATCH] git-commit: Only describe --dry-run once

[Junio C Hamano]

Johannes Gilger <heipei@hackvalue.de> writes:

> Junio described the option in 3a5d13a and then again in 60c2993.

Thanks.

I must have been too tired to think straight when I did 60c2993.

I think it is a better option just to revert that commit except for the
second hunk that makes it stop talking about "git status", like this.

I'd apply your typofix as a separate patch.

Thanks.

 Documentation/git-commit.txt |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 64f94cf..0578a40 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -9,7 +9,7 @@ SYNOPSIS
 --------
 [verse]
 'git commit' [-a | --interactive] [-s] [-v] [-u<mode>] [--amend] [--dry-run]
-	   [(-c | -C) <commit>] [-F <file> | -m <msg>] [--dry-run]
+	   [(-c | -C) <commit>] [-F <file> | -m <msg>]
 	   [--allow-empty] [--no-verify] [-e] [--author=<author>]
 	   [--cleanup=<mode>] [--] [[-i | -o ]<file>...]
 
@@ -69,12 +69,6 @@ OPTIONS
 	Like '-C', but with '-c' the editor is invoked, so that
 	the user can further edit the commit message.
 
---dry-run::
-	Do not actually make a commit, but show the list of paths
-	with updates in the index, paths with changes in the work tree,
-	and paths that are untracked, similar to the one that is given
-	in the commit log editor.
-
 -F <file>::
 --file=<file>::
 	Take the commit message from the given file.  Use '-' to

Re: [PATCH] git-commit: Only describe --dry-run once

[Johannes Gilger]

On 13/09/09 11:53, Junio C Hamano wrote:
> I think it is a better option just to revert that commit except for the
> second hunk that makes it stop talking about "git status", like this.

Woops, didn't realize you also duplicated the long description. I 
promise to be more thorough next time ;)

Greetings,
Jojo

-- 
Johannes Gilger <heipei@hackvalue.de>
http://heipei.net
GPG-Key: 0x42F6DE81
GPG-Fingerprint: BB49 F967 775E BB52 3A81  882C 58EE B178 42F6 DE81