From: Junio C Hamano <junkio@cox.net>
Date: Tue, 14 Feb 2006 07:26:53 +0000 (-0800)
Subject: Merge branch 'pb/bisect'
X-Git-Tag: v1.3.0-rc1~216
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=057f98eda179491c3f32c556f523e8786c2cbab5;hp=810255fd12536d296597a0366f514bf65c2e10f6;p=git.git

Merge branch 'pb/bisect'

* pb/bisect:
  Properly git-bisect reset after bisecting from non-master head
---

diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 53b64fa5..214ed235 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -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
 -----------
@@ -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].
 
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 72201be5..1056b7c8 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.1.GIT
+DEF_VER=v1.2.GIT
 
 # First try git-describe, then see if there is a version file
 # (included in release tarballs), then default
diff --git a/git-commit.sh b/git-commit.sh
index 59551d99..ab5e6bc1 100755
--- a/git-commit.sh
+++ b/git-commit.sh
@@ -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
 
@@ -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...
diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index 157c7e4d..025ef2d5 100755
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -42,7 +42,7 @@ then
 
 	# Make sure we are in a valid repository of a vintage we understand.
 	GIT_DIR="$GIT_DIR" git repo-config --get core.nosuch >/dev/null
-	if test $? == 128
+	if test $? = 128
 	then
 	    exit
 	fi