path: root/
diff options
authorJunio C Hamano <>2007-02-26 09:20:42 (GMT)
committerJunio C Hamano <>2007-02-26 09:20:42 (GMT)
commit048f48a2fdefdf71e7af19ec7111000ce2ebf52e (patch)
treeee91b56c9071972b1585fa65838da5748c0abfd9 /
parent646b3299613f0dd947557bc965660986d024322b (diff)
parentc260d790c85c07a5f50235f664c36725deedfb10 (diff)
Merge branch 'master' into js/diff-ni
* master: (201 commits) Documentation: link in material to the top documentation page. Documentation: document remote.<name>.tagopt GIT git-remote: support remotes with a dot in the name Documentation: describe "-f/-t/-m" options to "git-remote add" diff --cc: fix display of symlink conflicts during a merge. merge-recursive: fix longstanding bug in merging symlinks merge-index: fix longstanding bug in merging symlinks diff --cached: give more sensible error message when HEAD is yet to be created. Update tests to use test-chmtime Add test-chmtime: a utility to change mtime on files Add Release Notes to prepare for Allow arbitrary number of arguments to git-pack-objects rerere: do not deal with symlinks. rerere: do not skip two conflicted paths next to each other. Don't modify CREDITS-FILE if it hasn't changed. diff-patch: Avoid emitting double-slashes in textual patch. Reword git-am 3-way fallback failure message. Limit filename for format-patch core.legacyheaders: Use the description used in RelNotes-1.5.0 ...
Diffstat (limited to '')
1 files changed, 4 insertions, 0 deletions
diff --git a/ b/
index cfa1511..be3677c 100755
--- a/
+++ b/
@@ -318,6 +318,10 @@ esac
case "$all,$also" in
+ if test ! -f "$THIS_INDEX"
+ then
+ die 'nothing to commit (use "git add file1 file2" to include for commit)'
+ fi
save_index &&
cd_to_toplevel &&