projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 69e7491) | patch
git-commit: Allow to amend a merge commit that does not change the tree
authorJunio C Hamano <gitster@pobox.com>
Mon, 3 Dec 2007 07:55:23 +0000 (23:55 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 3 Dec 2007 07:55:23 +0000 (23:55 -0800)
commit9663c3bc6a04b9b4f63a54b820d3edb16aa95e6d
treed71955c3aa9b04fec7b11564edff1106913cbbe0tree | snapshot
parent69e7491835a0aa4e1a793a7c131783d8bb1cbb2bcommit | diff
git-commit: Allow to amend a merge commit that does not change the tree

Normally, it should not be allowed to generate an empty commit. A merge
commit generated with git 'merge -s ours' does not change the tree (along
the first parent), but merges are not "empty" even if they do not change
the tree. Hence, we should be careful not to forbid this case.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin-commit.c diff | blob | history
Git—the stupid content tracker