From e6604c3537e8b60d6cbc821e7d356924c0a0e809 Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Fri, 2 Aug 2013 15:16:40 -0700 Subject: [PATCH 1/3] log doc: the argument to --encoding is not optional $ git log --encoding fatal: Option '--encoding' requires a value $ git rev-list --encoding fatal: Option '--encoding' requires a value The argument to --encoding has always been mandatory. Unfortunately manpages like git-rev-list(1), git-log(1), and git-show(1) have described the option's syntax as "--encoding[=]" since it was first documented. Clarify by removing the extra brackets. Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- Documentation/git-rev-list.txt | 2 +- Documentation/pretty-options.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt index 65ac27e0c9..045b37b82e 100644 --- a/Documentation/git-rev-list.txt +++ b/Documentation/git-rev-list.txt @@ -40,7 +40,7 @@ SYNOPSIS [ \--right-only ] [ \--cherry-mark ] [ \--cherry-pick ] - [ \--encoding[=] ] + [ \--encoding= ] [ \--(author|committer|grep)= ] [ \--regexp-ignore-case | -i ] [ \--extended-regexp | -E ] diff --git a/Documentation/pretty-options.txt b/Documentation/pretty-options.txt index 5e499421a4..eea0e306a8 100644 --- a/Documentation/pretty-options.txt +++ b/Documentation/pretty-options.txt @@ -28,7 +28,7 @@ people using 80-column terminals. This is a shorthand for "--pretty=oneline --abbrev-commit" used together. ---encoding[=]:: +--encoding=:: The commit objects record the encoding used for the log message in their encoding header; this option can be used to tell the command to re-code the commit log message in the encoding From 5104d21fbdf7c7bda341d4f0ff406fb66dce839d Mon Sep 17 00:00:00 2001 From: Torstein Hegge Date: Fri, 2 Aug 2013 20:40:07 +0200 Subject: [PATCH 2/3] Documentation/rev-list-options: add missing word in --*-parents A commit has "parent commits" or "parents", not "commits". Signed-off-by: Torstein Hegge Signed-off-by: Junio C Hamano --- Documentation/rev-list-options.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt index 3bdbf5e856..83ae20c9c6 100644 --- a/Documentation/rev-list-options.txt +++ b/Documentation/rev-list-options.txt @@ -119,7 +119,7 @@ if it is part of the log message. --no-min-parents:: --no-max-parents:: - Show only commits which have at least (or at most) that many + Show only commits which have at least (or at most) that many parent commits. In particular, `--max-parents=1` is the same as `--no-merges`, `--min-parents=2` is the same as `--merges`. `--max-parents=0` gives all root commits and `--min-parents=3` all octopus merges. From 0bf5ce4ef27dd24461d7b7b8049058bf80301ddf Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Sat, 3 Aug 2013 16:37:15 +0200 Subject: [PATCH 3/3] fix typo in documentation of git-svn Signed-off-by: Felix Gruber Signed-off-by: Junio C Hamano --- Documentation/git-svn.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index aad452f169..4dd3bcb511 100644 --- a/Documentation/git-svn.txt +++ b/Documentation/git-svn.txt @@ -256,7 +256,7 @@ first have already been pushed into SVN. For each patch, one may answer "yes" (accept this patch), "no" (discard this patch), "all" (accept all patches), or "quit". + - 'git svn dcommit' returns immediately if answer if "no" or "quit", without + 'git svn dcommit' returns immediately if answer is "no" or "quit", without committing anything to SVN. 'branch'::