diff options
| author |  Nikolai Weibull <mailing-lists.git@rawuncut.elitemail.org> | 2005-12-09 00:28:05 +0100 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2005-12-08 15:50:13 -0800 |
| commit | 16cc50d12e8852583bde5c1116e4075f79d0a403 (patch) | |
| tree | ffe39c5df3e30917063e853b9538bf56ee676fe8 /Documentation/git-merge-index.txt | |
| parent | Fix the description of --utf8 and --keep to git-am. (diff) | |
| download | tgif-16cc50d12e8852583bde5c1116e4075f79d0a403.tar.xz | |
Use uniform description for the '--' option.
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>
Diffstat (limited to 'Documentation/git-merge-index.txt')
| -rw-r--r-- | Documentation/git-merge-index.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt index 60306429fb..fbc986aa84 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. |