X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fgit-commit.txt;h=214ed235c554de89edc4f614072b50c6f0724ded;hb=061ad5f4de16b4997f1de962dc4512546c62fe53;hp=5b1b4d37804fed9ee353eda1b3a093e692e828c6;hpb=64491e1ea95acde1aa77db539ba498593a0fcbc5;p=git.git

diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 5b1b4d37..214ed235 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -85,27 +85,12 @@ OPTIONS
 <file>...::
 	Files to be committed.  The meaning of these is
 	different between `--include` and `--only`.  Without
-	either, it defaults `--include` semantics.
+	either, it defaults `--only` semantics.
 
 If you make a commit and then found a mistake immediately after
 that, you can recover from it with gitlink:git-reset[1].
 
 
-WARNING
--------
-
-The 1.2.0 and its maintenance series 1.2.X will keep the
-traditional `--include` semantics as the default when neither
-`--only` nor `--include` is specified and `paths...` are given.
-This *will* change during the development towards 1.3.0 in the
-'master' branch of `git.git` repository.  If you are using this
-command in your scripts, and you depend on the traditional
-`--include` semantics, please update them to explicitly ask for
-`--include` semantics.  Also if you are used to making partial
-commit using `--include` semantics, please train your fingers to
-say `git commit --include paths...` (or `git commit -i paths...`).
-
-
 Discussion
 ----------
 
@@ -121,7 +106,7 @@ even the command is invoked from a subdirectory.
 That is, update the specified paths to the index and then commit
 the whole tree.
 
-`git commit --only paths...` largely bypasses the index file and
+`git commit paths...` largely bypasses the index file and
 commits only the changes made to the specified paths.  It has
 however several safety valves to prevent confusion.