summaryrefslogtreecommitdiff
path: root/git-checkout.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-05-09 19:32:08 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-05-09 19:32:08 -0700
commit7278a29a277750e9e3cccce3cfb751d6171b1a43 (patch)
treed15df79e0893f45c099867a513e3969d5f9659c9 /git-checkout.sh
parentMerge branch 'jc/grep' into next (diff)
parentMerge branch 'fix' (diff)
downloadtgif-7278a29a277750e9e3cccce3cfb751d6171b1a43.tar.xz
Merge branch 'master' into next
* master: checkout: use --aggressive when running a 3-way merge (-m). revert/cherry-pick: use aggressive merge. read-cache.c: use xcalloc() not calloc() apply: fix infinite loop with multiple patches with --index
Diffstat (limited to 'git-checkout.sh')
-rwxr-xr-xgit-checkout.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-checkout.sh b/git-checkout.sh
index 463ed2eaff..a11c939c30 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