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 optionalmaint
commit
fb56570821
|
@ -40,7 +40,7 @@ SYNOPSIS
|
||||||
[ \--right-only ]
|
[ \--right-only ]
|
||||||
[ \--cherry-mark ]
|
[ \--cherry-mark ]
|
||||||
[ \--cherry-pick ]
|
[ \--cherry-pick ]
|
||||||
[ \--encoding[=<encoding>] ]
|
[ \--encoding=<encoding> ]
|
||||||
[ \--(author|committer|grep)=<pattern> ]
|
[ \--(author|committer|grep)=<pattern> ]
|
||||||
[ \--regexp-ignore-case | -i ]
|
[ \--regexp-ignore-case | -i ]
|
||||||
[ \--extended-regexp | -E ]
|
[ \--extended-regexp | -E ]
|
||||||
|
|
|
@ -256,7 +256,7 @@ first have already been pushed into SVN.
|
||||||
For each patch, one may answer "yes" (accept this patch), "no" (discard this
|
For each patch, one may answer "yes" (accept this patch), "no" (discard this
|
||||||
patch), "all" (accept all patches), or "quit".
|
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.
|
committing anything to SVN.
|
||||||
|
|
||||||
'branch'::
|
'branch'::
|
||||||
|
|
|
@ -28,7 +28,7 @@ people using 80-column terminals.
|
||||||
This is a shorthand for "--pretty=oneline --abbrev-commit"
|
This is a shorthand for "--pretty=oneline --abbrev-commit"
|
||||||
used together.
|
used together.
|
||||||
|
|
||||||
--encoding[=<encoding>]::
|
--encoding=<encoding>::
|
||||||
The commit objects record the encoding used for the log message
|
The commit objects record the encoding used for the log message
|
||||||
in their encoding header; this option can be used to tell the
|
in their encoding header; this option can be used to tell the
|
||||||
command to re-code the commit log message in the encoding
|
command to re-code the commit log message in the encoding
|
||||||
|
|
|
@ -119,7 +119,7 @@ if it is part of the log message.
|
||||||
--no-min-parents::
|
--no-min-parents::
|
||||||
--no-max-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`,
|
commits. In particular, `--max-parents=1` is the same as `--no-merges`,
|
||||||
`--min-parents=2` is the same as `--merges`. `--max-parents=0`
|
`--min-parents=2` is the same as `--merges`. `--max-parents=0`
|
||||||
gives all root commits and `--min-parents=3` all octopus merges.
|
gives all root commits and `--min-parents=3` all octopus merges.
|
||||||
|
|
Loading…
Reference in New Issue