rebase: cherry-pick: add merge options
authorFelipe Contreras <felipe.contreras@gmail.com>
Sun, 9 Jun 2013 19:24:48 +0000 (14:24 -0500)
committerFelipe Contreras <felipe.contreras@gmail.com>
Wed, 30 Apr 2014 18:59:23 +0000 (13:59 -0500)
commitaa2008456aa4f2add4567843faea7cadb3a172aa
treefc4bd39d018038564e5ae0093b37151676942b60
parent568fe008949660c32fd3427b996334685ac90f24
rebase: cherry-pick: add merge options

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
git-rebase--cherrypick.sh