Thread (19 messages) flat view 19 messages, 2 authors, 2016-06-15
DORMANTno replies

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

From: Nikolai Weibull <hidden>
Date: 2016-06-15 22:42:14
Subsystem: documentation, the rest · Maintainers: Jonathan Corbet, Linus Torvalds

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

Signed-off-by: Nikolai Weibull <redacted>

---

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

54160acf1b953d34c161b27aa2b320bbf61ac86e
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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help