diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-12-11 16:49:45 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-12-11 16:49:45 -0800 |
| commit | a9572072f0ab0ac97e64b0dc01254a3ad95befe1 (patch) | |
| tree | 2375e3b4aea11444375f9f587c8ca4cd8d22d6d0 /Documentation/git-merge-index.txt | |
| parent | GIT 0.99.9l aka 1.0rc4 (diff) | |
| parent | t/t6022: a new test for renaming merge. (diff) | |
| download | git-0.99.9m.tar.gz git-0.99.9m.zip | |
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. |