MAN page from RedHat EL 7 git-tools-2019.11-1.el7.noarch.rpm
Section: User Commands (1)
git-rebase-theirs -Resolve rebase conflicts and failed cherry-picks by favoring 'theirs' version
Resolve git rebase conflicts in FILE(s) by favoring 'theirs' version.
When using git rebase, conflicts are usually wanted to be resolved by favoringthe <working branch> version (the branch being rebased, 'theirs' side in arebase), instead of the <upstream> version (the base branch, 'ours' side)
But git rebase --strategy -X theirs is only available from git 1.7.3For older versions, git-rebase-theirs is the solution. And Despite the name,it's also useful for fixing failed cherry-picks.
It works by discarding all lines between '<<<<<<< ' and '========'inclusive, and also the the '>>>>>> commit' marker.
By default it outputs to stdout, but files can be edited in-placeusing --in-place, which, unlike sed, creates a backup by default.
- -h, --help
- show usage information.
- -v, --verbose
- print more details in stderr.
- edit files in place, creating a backup withSUFFIXextension. Default if blank is ".bak"
- disables backup
Rodrigo Silva (MestreLion) linuxAATTrodrigosilva.com
- SEE ALSO
This document was created byman2html,using the manual pages.