threads / patch / 2782

patch, 17 partsUse uniform description for the '--' option.

Subject: [PATCH 3/17] Use uniform description for the '--' option.

## tl;dr

2 messages between Dec 8, 2005 and Dec 8, 2005. Diffs are folded; open one to read it.

replies: 1people: 1as markdown or json

Nikolai Weibull· Dec 8, 2005, 23:28 UTC · lore

[PATCH 2/17] Fix the description of --utf8 and --keep to git-am.

The git-am script actually transform --utf8 and --keep to -u and -k when sent to git-mailinfo.

Signed-off-by: Nikolai Weibull <nikolai@bitwi.se>

---

 Documentation/git-am.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

c11386158dd597184fbc14df5f728bddd23b3d17

Show changes to Documentation/git-am.txt +1 −1

diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 1ceed11..6645e82 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -28,7 +28,7 @@ OPTIONS
 	area to store extracted patches.
 
 --utf8, --keep::
-	Pass `--utf8` and `--keep` flags to `git-mailinfo` (see
+	Pass `-u` and `-k` flags to `git-mailinfo` (see
 	gitlink:git-mailinfo[1]).
 
 --binary::

-- 
0.99.9l

Nikolai Weibull· Dec 8, 2005, 23:28 UTC · re: Nikolai Weibull · lore

All descriptions of the '--' option were the same except for that in Documentation/git-merge-index.txt.

Signed-off-by: Nikolai Weibull <nikolai@bitwi.se>

---

 Documentation/git-merge-index.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

54160acf1b953d34c161b27aa2b320bbf61ac86e

Show changes to Documentation/git-merge-index.txt +1 −1

diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt
index 6030642..fbc986a 100644
--- a/Documentation/git-merge-index.txt
+++ b/Documentation/git-merge-index.txt
@@ -20,7 +20,7 @@ files are passed as arguments 5, 6 and 7
 OPTIONS
 -------
 --::
-	Interpret all following arguments as filenames.
+	Do not interpret any more arguments as options.
 
 -a::
 	Run merge against all files in the index that need merging.

-- 
0.99.9l