diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-05-09 19:24:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-09 19:24:16 -0700 |
| commit | f7a3276bab880222e3117f8b8cbef40920dfe884 (patch) | |
| tree | 777beb161c10d03c8185d35fd0ac2a04f06850cb | |
| parent | 8c2462dc5bd1aeb42eb5e07e82f9d062db43cd21 (diff) | |
| parent | 8d7a397aab561d3782f531e733b617e0e211f04a (diff) | |
| download | git-f7a3276bab880222e3117f8b8cbef40920dfe884.tar.gz git-f7a3276bab880222e3117f8b8cbef40920dfe884.tar.xz | |
Merge branch 'fix'
* fix:
checkout: use --aggressive when running a 3-way merge (-m).
revert/cherry-pick: use aggressive merge.
| -rwxr-xr-x | git-checkout.sh | 2 | ||||
| -rwxr-xr-x | git-revert.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/git-checkout.sh b/git-checkout.sh index 463ed2eaf..a11c939c3 100755 --- a/git-checkout.sh +++ b/git-checkout.sh @@ -144,7 +144,7 @@ else work=`git write-tree` && git read-tree --reset $new && git checkout-index -f -u -q -a && - git read-tree -m -u $old $new $work || exit + git read-tree -m -u --aggressive $old $new $work || exit if result=`git write-tree 2>/dev/null` then diff --git a/git-revert.sh b/git-revert.sh index c19d3a691..de8b5f0f0 100755 --- a/git-revert.sh +++ b/git-revert.sh @@ -137,7 +137,7 @@ esac >.msg # $prev and $commit on top of us (when cherry-picking or replaying). echo >&2 "First trying simple merge strategy to $me." -git-read-tree -m -u $base $head $next && +git-read-tree -m -u --aggressive $base $head $next && result=$(git-write-tree 2>/dev/null) || { echo >&2 "Simple $me fails; trying Automatic $me." git-merge-index -o git-merge-one-file -a || { |