diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-12-02 23:55:23 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-12-02 23:55:23 -0800 |
| commit | 9663c3bc6a04b9b4f63a54b820d3edb16aa95e6d (patch) | |
| tree | d71955c3aa9b04fec7b11564edff1106913cbbe0 /git-merge-resolve.sh | |
| parent | 69e7491835a0aa4e1a793a7c131783d8bb1cbb2b (diff) | |
| download | git-9663c3bc6a04b9b4f63a54b820d3edb16aa95e6d.tar.gz git-9663c3bc6a04b9b4f63a54b820d3edb16aa95e6d.tar.xz | |
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>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions