172

git-rebase手册页提及-X<option>可以传递给git-merge. 何时/如何准确？

我想通过应用带有递归策略和他们的选项的补丁来重新定位（应用任何棒，而不是跳过整个冲突的提交）。我不想合并，我想让历史线性化。

我试过了：

git rebase -Xtheirs

和

git rebase -s 'recursive -Xtheirs'

但 git-X在这两种情况下都拒绝。

git rebase -Xtheirs在最近的版本中工作，除了树冲突需要手动解决。解决这些冲突后，您需要运行git rebase -Xtheirs --continue（重复）。-X

4

3 回答 3

271

您可以将它与 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选项来传递所选合并策略可以理解的额外选项。

注意：“我们的”和“他们的”与他们在直接合并期间所做的相反。换句话说，“他们的”有利于当前分支上的提交。

于 2010-11-25T03:11:42.857 回答
22

这适用于带有自己的一组选项的合并策略

git rebase <branch> -s recursive -X theirs

应该可以工作，虽然这个补丁提到（2010 年 2 月）：

手册页说git-rebase支持合并策略，但是 rebase 命令不知道-X，并在出现时给出了用法。

所以如果它仍然不起作用，现在正在辩论！
（最近的 git 支持）

从提交 db2b3b820e2b28da268cc88adff076b396392dfe更新（2013 年 7 月，git 1.8.4+），

不要忽略交互式变基中的合并选项

合并策略及其选项可以在 中指定git rebase，但使用 时-- interactive，它们将被完全忽略。

签字人：Arnaud Fontaine

这意味着-X和策略现在可以与交互式变基以及普通变基一起使用。

于 2010-05-31T18:38:44.420 回答
7

正如iCrazy所说，此功能仅适用于 git 1.7.3 及更高版本。因此，对于仍在使用 1.7.1 的可怜人（如我），我提出了一个我自己做的解决方案：

git-rebase-他们的

这是一个非常完善（因此很长）的脚本，用于生产用途：ui 选项、处理多个文件、检查文件是否真的有冲突标记等，但“核心”可以总结为 2 行：

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
于 2012-04-17T22:57:54.887 回答