1GIT-REBASE-THEIRS(1)        General Commands Manual       GIT-REBASE-THEIRS(1)
2
3
4

NAME

6       git-rebase-theirs - Resolve rebase conflicts and failed cherry-picks by
7       favoring 'theirs' version
8

SYNOPSIS

10       git-rebase-theirs [options] [--] FILE...
11

DESCRIPTION

13       Resolve git rebase conflicts in FILE(s) by favoring 'theirs' version.
14
15       When using git rebase, conflicts are usually wanted to be resolved by
16       favoring the <working branch> version (the branch being rebased,
17       'theirs' side in a rebase), instead of the <upstream> version (the base
18       branch, 'ours' side)
19
20       But git rebase --strategy -X theirs is only available from git 1.7.3
21       For older versions, git-rebase-theirs is the solution. And Despite the
22       name, it's also useful for fixing failed cherry-picks.
23
24       It works by discarding all lines between '<<<<<<< ' and '========'
25       inclusive, and also the the '>>>>>> commit' marker.
26
27       By default it outputs to stdout, but files can be edited in-place using
28       --in-place, which, unlike sed, creates a backup by default.
29

OPTIONS

31       -h, --help
32               show usage information.
33
34       -v, --verbose
35               print more details in stderr.
36
37       --in-place[=SUFFIX]
38               edit files in place, creating a backup with SUFFIX extension.
39               Default if blank is ".bak"
40
41       --no-backup
42               disables backup
43

SEE ALSO

45       https://github.com/MestreLion/git-tools
46

AUTHOR

48       Rodrigo Silva (MestreLion) linux@rodrigosilva.com
49
50
51
52                                  2016-01-31              GIT-REBASE-THEIRS(1)