projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: bb5ebed) | patch
merge --no-commit: tweak message
authorJunio C Hamano <junkio@cox.net>
Fri, 23 Dec 2005 23:48:09 +0000 (15:48 -0800)
committerJunio C Hamano <junkio@cox.net>
Fri, 23 Dec 2005 23:48:09 +0000 (15:48 -0800)
commit695bf722da848e0cd2692bc07c4a2773c52b4216
treefdee9c1ff82b2e40dfcdddc0c02a3792c36aba70tree | snapshot
parentbb5ebed731378f9ebec9bcd438aa69e086d73359commit | diff
merge --no-commit: tweak message

We did not distinguish the case the user asked not to make a
commit with --no-commit flag and the automerge failed.  Tell
these cases apart and phrase dying message differently.

Signed-off-by: Junio C Hamano <junkio@cox.net>
git-merge.sh diff | blob | history
The core git plumbing