projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c674d05) | patch
revert: add "--strategy" option to choose merge strategy
authorChristian Couder <chriscool@tuxfamily.org>
Wed, 31 Mar 2010 19:22:08 +0000 (21:22 +0200)
committerJunio C Hamano <gitster@pobox.com>
Thu, 1 Apr 2010 18:14:11 +0000 (11:14 -0700)
commit91e525989665d69ace11b8f39618b1e8004fe19a
tree11e5ea3dc5fb54006f8ac74d6d739be52eb4c47etree | snapshot
parentc674d0527396e4100454e8992ed7381ee29dd54ecommit | diff
revert: add "--strategy" option to choose merge strategy

This patch makes it possible to use a different merge strategy when
cherry-picking. This is usefull mainly for debugging purposes as it
allows to see if some failures are caused by the merge strategy used or
not.

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