mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-18 15:04:49 +01:00
Code Activity

Merge branch 'jc/commit'

Browse source 
* jc/commit:
  git-commit: Now --only semantics is the default.
This commit is contained in:
Junio C Hamano 2006-02-13 02:38:20 -08:00
commit 862e5dccbd
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Documentation/git-commit.txt
View file

@ -8,8 +8,8 @@ git-commit - Record your changes
SYNOPSIS SYNOPSIS
-------- --------
[verse] [verse]
'git-commit' [-a] [-i] [-s] [-v] [(-c | -C) <commit> | -F <file> | -m <msg>] 'git-commit' [-a] [-s] [-v] [(-c | -C) <commit> | -F <file> | -m <msg>]
[-e] [--author <author>] [--] <file>... [-e] [--author <author>] [--] [[-i | -o ]<file>...]
DESCRIPTION DESCRIPTION
----------- -----------
@ -73,15 +73,20 @@ OPTIONS
commit the whole index. This is the traditional commit the whole index. This is the traditional
behaviour. behaviour.
--:: -o|--only::
Do not interpret any more arguments as options.
<file>...::
Commit only the files specified on the command line. Commit only the files specified on the command line.
This format cannot be used during a merge, nor when the This format cannot be used during a merge, nor when the
index and the latest commit does not match on the index and the latest commit does not match on the
specified paths to avoid confusion. 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 If you make a commit and then found a mistake immediately after
that, you can recover from it with gitlink:git-reset[1]. that, you can recover from it with gitlink:git-reset[1].

9
git-commit.sh
View file

@ -3,7 +3,7 @@
# Copyright (c) 2005 Linus Torvalds # Copyright (c) 2005 Linus Torvalds
# Copyright (c) 2006 Junio C Hamano # 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 SUBDIRECTORY_OK=Yes
. git-sh-setup . git-sh-setup
@ -340,11 +340,8 @@ case "$#,$also$only" in
0,) 0,)
;; ;;
*,) *,)
echo >&2 "assuming --include paths..." echo >&2 "assuming --only paths..."
also=t also=
# Later when switch the defaults, we will replace them with these:
# echo >&2 "assuming --only paths..."
# also=
# If we are going to launch an editor, the message won't be # If we are going to launch an editor, the message won't be
# shown without this... # shown without this...