projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: fd662dd) | patch
git-merge knows some strategies want to skip trivial merges
authorJunio C Hamano <junkio@cox.net>
Sat, 18 Mar 2006 22:50:53 +0000 (14:50 -0800)
committerJunio C Hamano <junkio@cox.net>
Mon, 20 Mar 2006 08:50:37 +0000 (00:50 -0800)
commit6ea23343ce2962a5c76ed62a29fd17cb30954de2
treee722be23a80a6bb52ef227c0ffa359202f2812d5tree | snapshot
parentfd662dd500cded4b04b1154dc77cc989a5ddc5b8commit | diff
git-merge knows some strategies want to skip trivial merges

Most notably "ours".  Also this makes sure we do not record
duplicated parents on the parent list of the resulting commit.

This is based on Mark Wooding's work, but does not change the UI
nor introduce new flags.

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