2 messages, 2 authors, 2016-06-15 · open the first message on its own page
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:43:08
I've minimally tried this on my private machine. Looks pretty nice for simple merges, but I think we would want --cc not -c most of the time. Pushed out in 'next'. Thanks.
From: Jakub Narebski <hidden>
Date: 2016-06-15 22:43:08
Junio C Hamano wrote:
I've minimally tried this on my private machine. Looks pretty nice for simple merges, but I think we would want --cc not -c most of the time.
Please note that --cc would need some changes to both git_difftree_body and git_patchset_body; it is not just matter of replacing '-c' by '--cc'. Hunk simplification might mean that whole patch vanishes. So sometimes we have difftree (raw diff, whatchanged) line which does not have corresponding patch, and there should be no "patch" link (this is harder part). This mean also that in git_patchset_body we need sometimes to skip some difftree line / difftree info line (this is easier part). -- Jakub Narebski Poland