Re: [PATCH (1b)] merge-recursive.c: Add more generic merge_recursive_generic()

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi,

Junio C Hamano wrote:
> The scripted version of revert/cherry-pick used git-merge-recursive
> because that is the Porcelain API available, and the current C-rewrite
> uses it as well, but if we are rewriting it to call merge-recursive
> machinery directly, it should be making a single merge request to
> merge_trees(), not "recursive" one.

This is an interesting point.
So perhaps we don't need stuff like my regarding merge_recursive_generic(),
at least not for revert/cherry-pick.

Regards,
  Stephan

-- 
Stephan Beyer <s-beyer@xxxxxxx>, PGP 0x6EDDD207FCC5040F
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux