projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: bc84a7f) | patch
revert: refactor merge recursive code into its own function
authorChristian Couder <chriscool@tuxfamily.org>
Wed, 31 Mar 2010 19:22:05 +0000 (21:22 +0200)
committerJunio C Hamano <gitster@pobox.com>
Thu, 1 Apr 2010 18:14:10 +0000 (11:14 -0700)
commitae8c79fd8fe47bfebf56ae83461cbedb934cff92
tree4ee63a3f0e539250c8398d9389ffce508dfa1569tree | snapshot
parentbc84a7fbac4ce85bb93eeb57b5cb39548d286ad0commit | diff
revert: refactor merge recursive code into its own function

The code that is used to do a recursive merge is extracted from
the revert_or_cherry_pick() function and put into a new
do_recursive_merge() function.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/revert.c diff | blob | history
Git—the stupid content tracker