summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 68e37f8)
raw | patch | inline | side by side (parent: 68e37f8)
author | Nikolai Weibull <mailing-lists.git@rawuncut.elitemail.org> | |
Thu, 8 Dec 2005 23:28:05 +0000 (00:28 +0100) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Thu, 8 Dec 2005 23:50:13 +0000 (15:50 -0800) |
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>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Documentation/git-merge-index.txt.
Signed-off-by: Nikolai Weibull <nikolai@bitwi.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Documentation/git-merge-index.txt | patch | blob | history |
index 60306429fb7cad45e063cef8f70fc79005df7f70..fbc986aa84d180d304a35a94dcd1f80e6a848b80 100644 (file)
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.