{"thread":{"id":"3330","subject":"[PATCH] Documentation: git-commit in 1.2.X series defaults to --include.","startedAt":"2006-02-14T07:53:10Z","lastAt":"2006-02-14T07:53:10Z","messageCount":1,"participants":["Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"16104","messageId":"7vd5hqtlzt.fsf@assigned-by-dhcp.cox.net","threadId":"3330","inReplyTo":null,"subject":"[PATCH] Documentation: git-commit in 1.2.X series defaults to --include.","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-02-14T07:53:10Z","receivedAt":"2006-02-14T07:53:10Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"The documentation was mistakenly describing the --only semantics to\nbe default.  The 1.2.0 release and its maintenance series 1.2.X will\nkeep the traditional --include semantics as the default.  Clarify the\nsituation.\n\nSigned-off-by: Junio C Hamano <junkio@cox.net>\n\n---\n\n * This will be part of 1.2.1 maintenance series.\n\n Documentation/git-commit.txt |   34 +++++++++++++++++++++++++++-------\n 1 files changed, 27 insertions(+), 7 deletions(-)\n\n64491e1ea95acde1aa77db539ba498593a0fcbc5\ndiff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt\nindex 53b64fa..5b1b4d3 100644\n--- a/Documentation/git-commit.txt\n+++ b/Documentation/git-commit.txt\n@@ -8,8 +8,8 @@ git-commit - Record your changes\n SYNOPSIS\n --------\n [verse]\n-'git-commit' [-a] [-i] [-s] [-v] [(-c | -C) <commit> | -F <file> | -m <msg>]\n-\t   [-e] [--author <author>] [--] <file>...\n+'git-commit' [-a] [-s] [-v] [(-c | -C) <commit> | -F <file> | -m <msg>]\n+\t   [-e] [--author <author>] [--] [[-i | -o ]<file>...]\n \n DESCRIPTION\n -----------\n@@ -73,19 +73,39 @@ OPTIONS\n \tcommit the whole index.  This is the traditional\n \tbehaviour.\n \n---::\n-\tDo not interpret any more arguments as options.\n-\n-<file>...::\n+-o|--only::\n \tCommit only the files specified on the command line.\n \tThis format cannot be used during a merge, nor when the\n \tindex and the latest commit does not match on the\n \tspecified paths to avoid confusion.\n \n+--::\n+\tDo not interpret any more arguments as options.\n+\n+<file>...::\n+\tFiles to be committed.  The meaning of these is\n+\tdifferent between `--include` and `--only`.  Without\n+\teither, it defaults `--include` semantics.\n+\n If you make a commit and then found a mistake immediately after\n that, you can recover from it with gitlink:git-reset[1].\n \n \n+WARNING\n+-------\n+\n+The 1.2.0 and its maintenance series 1.2.X will keep the\n+traditional `--include` semantics as the default when neither\n+`--only` nor `--include` is specified and `paths...` are given.\n+This *will* change during the development towards 1.3.0 in the\n+'master' branch of `git.git` repository.  If you are using this\n+command in your scripts, and you depend on the traditional\n+`--include` semantics, please update them to explicitly ask for\n+`--include` semantics.  Also if you are used to making partial\n+commit using `--include` semantics, please train your fingers to\n+say `git commit --include paths...` (or `git commit -i paths...`).\n+\n+\n Discussion\n ----------\n \n@@ -101,7 +121,7 @@ even the command is invoked from a subdi\n That is, update the specified paths to the index and then commit\n the whole tree.\n \n-`git commit paths...` largely bypasses the index file and\n+`git commit --only paths...` largely bypasses the index file and\n commits only the changes made to the specified paths.  It has\n however several safety valves to prevent confusion.\n \n-- \n1.2.0.g45dc\n"}]}