[PATCH] git-cherry-pick.txt: order options alphabetically
From: Jari Aalto <jari.aalto@cante.net>
Signed-off-by: Jari Aalto <jari.aalto@cante.net>
---
Documentation/git-cherry-pick.txt | 57 +++++++++++++++++++------------------
1 files changed, 29 insertions(+), 28 deletions(-)
diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
index 3c96fa8..6abde39 100644
--- a/Documentation/git-cherry-pick.txt
+++ b/Documentation/git-cherry-pick.txt
@@ -18,36 +18,16 @@ working tree to be clean (no modifications from the HEAD commit).
OPTIONS
-------
-<commit>...::
- Commits to cherry-pick.
- For a more complete list of ways to spell commits, see
- linkgit:gitrevisions[7].
- Sets of commits can be passed but no traversal is done by
- default, as if the '--no-walk' option was specified, see
- linkgit:git-rev-list[1].
-e::
--edit::
With this option, 'git cherry-pick' will let you edit the commit
message prior to committing.
--x::
- When recording the commit, append to the original commit
- message a note that indicates which commit this change
- was cherry-picked from. Append the note only for cherry
- picks without conflicts. Do not use this option if
- you are cherry-picking from your private branch because
- the information is useless to the recipient. If on the
- other hand you are cherry-picking between two publicly
- visible branches (e.g. backporting a fix to a
- maintenance branch for an older release from a
- development branch), adding this information can be
- useful.
-
--r::
- It used to be that the command defaulted to do `-x`
- described above, and `-r` was to disable it. Now the
- default is not to do `-x` so this option is a no-op.
+--ff::
+ If the current HEAD is the same as the parent of the
+ cherry-pick'ed commit, then a fast forward to this commit will
+ be performed.
-m parent-number::
--mainline parent-number::
@@ -70,14 +50,35 @@ OPTIONS
This is useful when cherry-picking more than one commits'
effect to your index in a row.
+-r::
+ It used to be that the command defaulted to do `-x`
+ described above, and `-r` was to disable it. Now the
+ default is not to do `-x` so this option is a no-op.
+
-s::
--signoff::
Add Signed-off-by line at the end of the commit message.
---ff::
- If the current HEAD is the same as the parent of the
- cherry-pick'ed commit, then a fast forward to this commit will
- be performed.
+-x::
+ When recording the commit, append to the original commit
+ message a note that indicates which commit this change
+ was cherry-picked from. Append the note only for cherry
+ picks without conflicts. Do not use this option if
+ you are cherry-picking from your private branch because
+ the information is useless to the recipient. If on the
+ other hand you are cherry-picking between two publicly
+ visible branches (e.g. backporting a fix to a
+ maintenance branch for an older release from a
+ development branch), adding this information can be
+ useful.
+
+<commit>...::
+ Commits to cherry-pick.
+ For a more complete list of ways to spell commits, see
+ linkgit:gitrevisions[7].
+ Sets of commits can be passed but no traversal is done by
+ default, as if the '--no-walk' option was specified, see
+ linkgit:git-rev-list[1].
EXAMPLES
--------
--
1.7.2.3
jari.aalto@cante.net <jari.aalto@cante.net>