aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-commit.txt
diff options
context:
space:
mode:
authorMartin Langhoff <martin@catalyst.net.nz>2006-05-08 10:03:37 +1200
committerMartin Langhoff <martin@catalyst.net.nz>2006-05-08 10:03:37 +1200
commit50c08d48722149d95f46bcc80a5211ea04b8a809 (patch)
tree15c465be37ba4fdd8824edb95085b81076b73af9 /Documentation/git-commit.txt
parenta248c9614fdd130229fb5f9565abbd77bd1d0cc9 (diff)
parentbe65e7d9fbd3ae6fc097cedade2afe39805fcf4e (diff)
downloadgit-50c08d48722149d95f46bcc80a5211ea04b8a809.tar.xz
Merge with git://kernel.org/pub/scm/git/git.git
Diffstat (limited to 'Documentation/git-commit.txt')
-rw-r--r--Documentation/git-commit.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 0a7365b9a8..38df59ce23 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -106,7 +106,7 @@ but can be used to amend a merge commit.
index and the latest commit does not match on the
specified paths to avoid confusion.
---::
+\--::
Do not interpret any more arguments as options.
<file>...::