cherry-pick/revert: add support for -X/--strategy-option
[gitweb.git] / t / t3032-merge-recursive-options.sh
2010-11-05 Merge branch 'master' of git://repo.or.cz/git-gui
2010-11-05 Merge branch 'maint'
2010-10-27 Merge branch 'ab/send-email-perl'
2010-10-27 Merge branch 'sb/send-email-use-to-from-input'
2010-10-27 Merge branch 'ab/require-perl-5.8'
2010-10-27 Merge branch 'jp/send-email-to-cmd'
2010-10-27 Merge branch 'as/daemon-multi-listen'
2010-10-27 Merge branch 'dm/mergetool-vimdiff'
2010-10-27 Merge branch 'kf/post-receive-sample-hook'
2010-10-27 Merge branch 'jf/merge-ignore-ws'
2010-08-27 merge-recursive: options to ignore whitespace changes