Skip to content

Commit

Permalink
git-commit: Now --only semantics is the default.
Browse files Browse the repository at this point in the history
This changes the "git commit paths..." to default to --only
semantics from traditional --include semantics, as agreed on the
list.

Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
Junio C Hamano committed Feb 13, 2006
1 parent bd9ca0b commit 4170a19
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 12 deletions.
17 changes: 11 additions & 6 deletions Documentation/git-commit.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ git-commit - Record your changes
SYNOPSIS
--------
[verse]
'git-commit' [-a] [-i] [-s] [-v] [(-c | -C) <commit> | -F <file> | -m <msg>]
[-e] [--author <author>] [--] <file>...
'git-commit' [-a] [-s] [-v] [(-c | -C) <commit> | -F <file> | -m <msg>]
[-e] [--author <author>] [--] [[-i | -o ]<file>...]

DESCRIPTION
-----------
Expand Down Expand Up @@ -73,15 +73,20 @@ OPTIONS
commit the whole index. This is the traditional
behaviour.

--::
Do not interpret any more arguments as options.

<file>...::
-o|--only::
Commit only the files specified on the command line.
This format cannot be used during a merge, nor when the
index and the latest commit does not match on the
specified paths to avoid confusion.

--::
Do not interpret any more arguments as options.

<file>...::
Files to be committed. The meaning of these is
different between `--include` and `--only`. Without
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].

Expand Down
9 changes: 3 additions & 6 deletions git-commit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Copyright (c) 2005 Linus Torvalds
# Copyright (c) 2006 Junio C Hamano

USAGE='[-a] [-i] [-s] [-v] [--no-verify] [-m <message> | -F <logfile> | (-C|-c) <commit>] [-e] [--author <author>] [<path>...]'
USAGE='[-a] [-s] [-v] [--no-verify] [-m <message> | -F <logfile> | (-C|-c) <commit>] [-e] [--author <author>] [[-i | -o] <path>...]'
SUBDIRECTORY_OK=Yes
. git-sh-setup

Expand Down Expand Up @@ -340,11 +340,8 @@ case "$#,$also$only" in
0,)
;;
*,)
echo >&2 "assuming --include paths..."
also=t
# Later when switch the defaults, we will replace them with these:
# echo >&2 "assuming --only paths..."
# also=
echo >&2 "assuming --only paths..."
also=

# If we are going to launch an editor, the message won't be
# shown without this...
Expand Down

0 comments on commit 4170a19

Please sign in to comment.