global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-14 10:53:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'np/addcommit' into next

Browse Source 
* np/addcommit:
  git-commit: allow --only to lose what was staged earlier.
  Documentation/git-commit: rewrite to make it more end-user friendly.
This commit is contained in:
Junio C Hamano
2006-12-11 14:56:18 -08:00
parent 4cf93e54d6 158d057789
commit 1384a54ccc
2 changed files with 150 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
git-commit.sh
View File

@@ -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