Jeff King f197ed2fbe commit: give advice on empty amend ... We generally disallow empty commits with "git commit". The output produced by the wt_status functions is generally sufficient to explain what happened. With --amend commits, however, things are a little more confusing. We would create an empty commit not if you actually have staged changes _now_, but if your staged changes match HEAD^. In this case, it is not immediately obvious why "git commit" claims no changes, but "git status" does not. Furthermore, we should point the user in the direction of git reset, which would eliminate the empty commit entirely. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2010-06-11 08:55:57 -07:00
..
add.c	Merge branch 'cp/add-u-pathspec'	2010-03-10 15:32:02 -08:00
annotate.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
apply.c	Merge branch 'maint'	2010-04-09 22:43:18 -07:00
archive.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
bisect--helper.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
blame.c	Change C99 comments to old-style C comments	2010-06-07 15:50:21 -07:00
branch.c	Merge branch 'lt/deepen-builtin-source'	2010-03-10 15:25:18 -08:00
bundle.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
cat-file.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
check-attr.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
check-ref-format.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
checkout-index.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
checkout.c	checkout -m --conflict=diff3: add a label for ancestor	2010-03-20 20:36:11 -07:00
clean.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
clone.c	clone: quell the progress report from init and report on clone	2010-05-04 10:02:46 -07:00
commit-tree.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
commit.c	commit: give advice on empty amend	2010-06-11 08:55:57 -07:00
config.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
count-objects.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
describe.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
diff-files.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
diff-index.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
diff-tree.c	Merge branch 'pb/log-first-parent-p-m'	2010-03-24 16:25:39 -07:00
diff.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
fast-export.c	Merge branch 'maint'	2010-03-28 17:42:58 -07:00
fetch-pack.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
fetch.c	Merge branch 'maint'	2010-04-09 22:43:18 -07:00
fmt-merge-msg.c	fmt-merge-msg: hide summary option	2010-03-24 19:45:31 -07:00
for-each-ref.c	Change C99 comments to old-style C comments	2010-06-07 15:50:21 -07:00
fsck.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
gc.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
grep.c	Merge branch 'rs/threaded-grep-context'	2010-04-03 12:28:39 -07:00
hash-object.c	Merge branch 'lt/deepen-builtin-source'	2010-03-10 15:25:18 -08:00
help.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
index-pack.c	Merge branch 'maint'	2010-05-01 20:23:10 -07:00
init-db.c	handle "git --bare init <dir>" properly	2010-05-10 11:25:37 -07:00
log.c	pretty: Initialize notes if %N is used	2010-04-13 18:15:08 -07:00
ls-files.c	ls: remove redundant logic	2010-03-21 16:23:44 -07:00
ls-remote.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
ls-tree.c	ls: remove redundant logic	2010-03-21 16:23:44 -07:00
mailinfo.c	Teach mailinfo %< as an alternative scissors mark	2010-04-04 10:17:55 -07:00
mailsplit.c	Merge branch 'sh/am-keep-cr'	2010-03-10 15:32:34 -08:00
merge-base.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
merge-file.c	merge-file --diff3: add a label for ancestor	2010-03-20 20:36:11 -07:00
merge-index.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
merge-ours.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
merge-recursive.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
merge-tree.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
merge.c	Merge branch 'cc/cherry-pick-ff'	2010-03-28 21:52:28 -07:00
mktag.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
mktree.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
mv.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
name-rev.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
notes.c	Merge branch 'sb/notes-parse-opt'	2010-03-28 21:52:28 -07:00
pack-objects.c	Merge branch 'lt/deepen-builtin-source'	2010-03-10 15:25:18 -08:00
pack-redundant.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
pack-refs.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
patch-id.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
prune-packed.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
prune.c	Merge branch 'lt/deepen-builtin-source'	2010-03-10 15:25:18 -08:00
push.c	Merge branch 'maint'	2010-04-09 22:43:18 -07:00
read-tree.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
receive-pack.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
reflog.c	Merge branch 'maint'	2010-04-19 22:41:30 -07:00
remote.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
replace.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
rerere.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
reset.c	Sync with 1.7.0.4	2010-03-31 15:14:27 -07:00
rev-list.c	Merge branch 'ef/maint-empty-commit-log'	2010-04-06 14:50:46 -07:00
rev-parse.c	Merge branch 'lt/deepen-builtin-source'	2010-03-10 15:25:18 -08:00
revert.c	cherry-pick: do not dump core when iconv fails	2010-05-08 16:56:21 -07:00
rm.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
send-pack.c	Merge branch 'ld/push-porcelain'	2010-03-15 00:58:24 -07:00
shortlog.c	Merge branch 'lt/deepen-builtin-source'	2010-03-10 15:25:18 -08:00
show-branch.c	show-branch: use DEFAULT_ABBREV instead of 7	2010-05-25 09:48:49 -07:00
show-ref.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
stripspace.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
symbolic-ref.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
tag.c	tag -v: use RUN_GIT_CMD to run verify-tag	2010-04-17 12:40:19 -07:00
tar-tree.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
unpack-file.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
unpack-objects.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
update-index.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
update-ref.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
update-server-info.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
upload-archive.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
var.c	Merge branch 'lt/deepen-builtin-source'	2010-03-10 15:25:18 -08:00
verify-pack.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
verify-tag.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00
write-tree.c	Move 'builtin-*' into a 'builtin/' subdirectory	2010-02-22 14:29:41 -08:00