git-rebase的手册提到可以通过-X<option>选项传递给git-merge。何时/如何使用？
我想通过应用补丁来进行变基，使用递归策略和theirs选项（应用任何符合要求的内容，而不是跳过整个有冲突的提交）。我不想合并，我想让历史线性化。
我尝试过：
git rebase -Xtheirs
并且
git rebase -s 'recursive -Xtheirs'
但是git在这两种情况下都会拒绝使用-X。
git rebase -Xtheirs 在最新版本中可行，但是树冲突需要手动解决。您需要在解决这些冲突后运行git rebase -Xtheirs --continue（重复使用-X）。
你可以在Git v1.7.3或更高版本中使用此功能。
git rebase --strategy-option theirs ${branch} # Long option
git rebase -X theirs ${branch} # Short option
(这是一个缩写，表示为git rebase --strategy recursive --strategy-option theirs ${branch}，根据文档所述。)
来自Git v1.7.3版本的发行说明：
git rebase --strategy <s>学会了--strategy-option/-X选项，以传递由所选择合并策略理解的额外选项。
NB："Ours" 和 "theirs" 的含义与直接合并时相反。 换句话说，“theirs”更偏向于在当前分支上提交的提交。
ours和theirs的含义似乎与我的预期相反。我需要使用theirs来支持我的当前分支。 - Craig McQueen这是针对带有自己选项集的合并策略的。
git rebase <branch> -s recursive -X theirs
虽然 这个补丁 （2010年2月）提到：“虽然手册说git rebase支持合并策略，但是rebase命令不知道-X，当它被使用时会给出用法。” 但是应该可以工作。
所以如果还不起作用，就正在进行讨论！
（在最近的git中得到支持）
来自 提交 db2b3b820e2b28da268cc88adff076b396392dfe （2013年7月，git 1.8.4+）的更新:
在交互式rebase中不要忽略合并选项
合并策略及其选项可以在
git rebase中指定，但是使用--interactive时，它们将被完全忽略。Signed-off-by: Arnaud Fontaine
这意味着-X和策略现在可以与交互式rebase以及普通rebase一起使用。
cp file file.bak
awk '/^<+ HEAD$/,/^=+$/{next} /^>+ /{next} 1' file.bak > file
这里是完整的脚本：
#!/bin/bash
#
# git-rebase-theirs - Resolve rebase conflicts by favoring 'theirs' version
#
# Copyright (C) 2012 Rodrigo Silva (MestreLion) <linux@rodrigosilva.com>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not see <http://www.gnu.org/licenses/gpl.html>
#Defaults:
verbose=0
backup=1
inplace=0
ext=".bak"
message() { printf "%s\n" "$1" >&2 ; }
skip() { message "skipping ${2:-$file}${1:+: $1}"; continue ; }
argerr() { printf "%s: %s\n" "$myname" "${1:-error}" >&2 ; usage 1 ; }
invalid() { argerr "invalid option: $1" ; }
missing() { argerr "missing${1:+ $1} operand." ; }
usage() {
cat <<- USAGE
Usage: $myname [options] [--] FILE...
USAGE
if [[ "$1" ]] ; then
cat >&2 <<- USAGE
Try '$myname --help' for more information.
USAGE
exit 1
fi
cat <<-USAGE
Resolve git rebase conflicts in FILE(s) by favoring 'theirs' version
When using git rebase, conflicts are usually wanted to be resolved
by favoring the <working branch> version (the branch being rebased,
'theirs' side in a rebase), instead of the <upstream> version (the
base branch, 'ours' side)
But git rebase --strategy -X theirs is only available from git 1.7.3
For older versions, $myname is the solution.
It works by discarding all lines between '<<<<<<< HEAD' and '========'
inclusive, and also the the '>>>>>> commit' marker.
By default it outputs to stdout, but files can be edited in-place
using --in-place, which, unlike sed, creates a backup by default.
Options:
-h|--help show this page.
-v|--verbose print more details in stderr.
--in-place[=SUFFIX] edit files in place, creating a backup with
SUFFIX extension. Default if blank is ""$ext"
--no-backup disables backup
Copyright (C) 2012 Rodrigo Silva (MestreLion) <linux@rodrigosilva.com>
License: GPLv3 or later. See <http://www.gnu.org/licenses/gpl.html>
USAGE
exit 0
}
myname="${0##*/}"
# Option handling
files=()
while (( $# )); do
case "$1" in
-h|--help ) usage ;;
-v|--verbose ) verbose=1 ;;
--no-backup ) backup=0 ;;
--in-place ) inplace=1 ;;
--in-place=* ) inplace=1
suffix="${1#*=}" ;;
-* ) invalid "$1" ;;
-- ) shift ; break ;;
* ) files+=( "$1" ) ;;
esac
shift
done
files+=( "$@" )
(( "${#files[@]}" )) || missing "FILE"
ext=${suffix:-$ext}
for file in "${files[@]}"; do
[[ -f "$file" ]] || skip "not a valid file"
if ((inplace)); then
outfile=$(tempfile) || skip "could not create temporary file"
trap 'rm -f -- "$outfile"' EXIT
cp "$file" "$outfile" || skip
exec 3>"$outfile"
else
exec 3>&1
fi
# Do the magic :)
awk '/^<+ HEAD$/,/^=+$/{next} /^>+ /{next} 1' "$file" >&3
exec 3>&-
((inplace)) || continue
diff "$file" "$outfile" >/dev/null && skip "no conflict markers found"
((backup)) && { cp "$file" "$file$ext" || skip "could not backup" ; }
cp "$outfile" "$file" || skip "could not edit in-place"
((verbose)) && message "resolved ${file}"
done
git rebase --strategy="recursive --theirs" master - Papadeltasierragit rebase -s recursive -X theirs <branch>，就像iCrazy回答的那样。 - MestreLion
git rebase --interactive。请查看我下面的更新答案。 - VonC