如何爲git rebase選擇合併策略？

Question

git-rebase手冊頁提到-X<option>可以傳遞給git-merge。何時/如何？

我想通過應用修補程序與遞歸戰略和他們選項（適用任何棒，而不是跳過整個衝突的承諾）衍合。我不想合併，我想讓歷史線性化。

我已經試過：

git rebase -Xtheirs 

和

git rebase -s 'recursive -Xtheirs' 

但混帳拒絕在這兩種情況下-X。

---

git rebase -Xtheirs在最近的版本中工作，除了樹衝突需要手動解決。解決這些衝突後，您需要運行git rebase -Xtheirs --continue（重複執行-X）。

Answer 1

你可以在Git v1.7.3或更高版本中使用它。

git rebase -s recursive -X theirs ${branch} 

從Git的v1.7.3版本說明：

git rebase --strategy <s>學到的-X選項傳遞由所選擇的合併策略理解額外的選項。

注：「我們」和「他們的」意味着他們在直接合並期間所做的相反。換句話說，「他們」傾向於當前分支的承諾。

更新：編輯得更清楚。

Answer 2

這對於帶着自己的一組選項

git rebase <branch> -s recursive -X theirs 

應該工作的合併策略，儘管this patch mentions（2010年2月）：

的手冊頁說，git-rebase支持融合的策略，但基金會 命令不知道約-X，並給出了它的使用情況。

所以，如果它仍然無法正常工作，現在正在辯論！
（在最近的Git支持）

---

更新從commit db2b3b820e2b28da268cc88adff076b396392dfe（2013年7月的git 1.8.4+），

不要忽視互動變基

合併戰略合併選項其選項可在git rebase中指定，但-- interactive則完全忽略。

參團的off-by：阿爾諾方丹

這意味着-X和現在的戰略互動變基，以及純重訂工作。

Answer 3

由於iCrazy表示，此功能僅適用於git 1.7.3以上版本。因此，對於可憐的靈魂（像我）仍然使用1.7.1，我提出一個解決方案，我做了自己：

git-rebase-theirs

這是一個很好的拋光（因此長）腳本，這意味着生產使用：用戶界面選項，處理多個文件，檢查文件是否確實有衝突標誌等，但「核心」可在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