projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Add example xinetd(8) configuration to Documentation/everyday.txt
[git.git]
/
git-merge-octopus.sh
diff --git
a/git-merge-octopus.sh
b/git-merge-octopus.sh
index
eb74f96
..
eb3f473
100755
(executable)
--- a/
git-merge-octopus.sh
+++ b/
git-merge-octopus.sh
@@
-90,7
+90,7
@@
do
NON_FF_MERGE=1
echo "Trying simple merge with $SHA1"
- git-read-tree -u -m $common $MRT $SHA1 || exit 2
+ git-read-tree -u -m
--aggressive
$common $MRT $SHA1 || exit 2
next=$(git-write-tree 2>/dev/null)
if test $? -ne 0
then