summaryrefslogtreecommitdiff
path: root/git-commit.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-12-13 19:08:20 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-12-13 19:08:20 (GMT)
commit78ba00407cf69c9f57f17e07d156336ce47c2b03 (patch)
tree4d98032c7541ac2c620b92c7ed67fca307738de5 /git-commit.sh
parentabcb49cb56fc6fa047a8838cd47fbdfa48791798 (diff)
parent158d0577891441c01457bbcaf45585d3b50f5d75 (diff)
downloadgit-78ba00407cf69c9f57f17e07d156336ce47c2b03.zip
git-78ba00407cf69c9f57f17e07d156336ce47c2b03.tar.gz
git-78ba00407cf69c9f57f17e07d156336ce47c2b03.tar.bz2
Merge branch 'np/addcommit'
* np/addcommit: git-commit: allow --only to lose what was staged earlier. Documentation/git-commit: rewrite to make it more end-user friendly. make 'git add' a first class user friendly interface to the index
Diffstat (limited to 'git-commit.sh')
-rwxr-xr-xgit-commit.sh12
1 files changed, 1 insertions, 11 deletions
diff --git a/git-commit.sh b/git-commit.sh
index 7e9742d..05828bb 100755
--- a/git-commit.sh
+++ b/git-commit.sh
@@ -350,19 +350,9 @@ t,)
refuse_partial "Cannot do a partial commit during a merge."
fi
TMP_INDEX="$GIT_DIR/tmp-index$$"
- if test -z "$initial_commit"
- then
- # make sure index is clean at the specified paths, or
- # they are additions.
- dirty_in_index=`git-diff-index --cached --name-status \
- --diff-filter=DMTU HEAD -- "$@"`
- test -z "$dirty_in_index" ||
- refuse_partial "Different in index and the last commit:
-$dirty_in_index"
- fi
commit_only=`git-ls-files --error-unmatch -- "$@"` || exit
- # Build the temporary index and update the real index
+ # Build a temporary index and update the real index
# the same way.
if test -z "$initial_commit"
then