diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-03-28 21:37:53 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-28 21:37:53 (GMT) |
| commit | 436b60ce7aac4cf8e496c57c9baae46094571b22 (patch) | |
| tree | 7caa04a8f179fa651146ea2ab03fd5724ba5088d /Documentation/git-merge.txt | |
| parent | 39c5835dd68473e6b829d94533e892cffee09286 (diff) | |
| parent | 4b7f53da7618e94985c9d9d5081b4bc44c45de2f (diff) | |
| download | git-436b60ce7aac4cf8e496c57c9baae46094571b22.zip git-436b60ce7aac4cf8e496c57c9baae46094571b22.tar.gz git-436b60ce7aac4cf8e496c57c9baae46094571b22.tar.bz2 | |
Merge branch 'jc/remove-treesame-parent-in-simplify-merges'
The --simplify-merges logic did not cull irrelevant parents from a
merge that is otherwise not interesting with respect to the paths
we are following.
This touches a fairly core part of the revision traversal
infrastructure; even though I think this change is correct, please
report immediately if you find any unintended side effect.
* jc/remove-treesame-parent-in-simplify-merges:
simplify-merges: drop merge from irrelevant side branch
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions