diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-08-05 13:00:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-08-05 13:00:20 -0700 |
| commit | fb5657082148297b61fbca7e64d51c1e7870309a (patch) | |
| tree | 14ab782877318041066b734607db98c4b4c6c362 | |
| parent | f5206f1239a2f193aed16bac1c3b8cf71dfbce39 (diff) | |
| parent | 0bf5ce4ef27dd24461d7b7b8049058bf80301ddf (diff) | |
| download | git-fb5657082148297b61fbca7e64d51c1e7870309a.tar.gz | |
Sync with maint to grab trivial doc fixes
* maint:
fix typo in documentation of git-svn
Documentation/rev-list-options: add missing word in --*-parents
log doc: the argument to --encoding is not optional
| -rw-r--r-- | Documentation/git-rev-list.txt | 2 | ||||
| -rw-r--r-- | Documentation/git-svn.txt | 2 | ||||
| -rw-r--r-- | Documentation/pretty-options.txt | 2 | ||||
| -rw-r--r-- | Documentation/rev-list-options.txt | 2 |
4 files changed, 4 insertions, 4 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>] ] + [ \--encoding=<encoding> ] [ \--(author|committer|grep)=<pattern> ] [ \--regexp-ignore-case | -i ] [ \--extended-regexp | -E ] 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':: 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>]:: +--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 diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt index 27f8de3d86..5bdfb42852 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. |