projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
git-merge: Exit with code 2 if no strategy was able to handle the merge.
[git.git]
/
git-octopus.sh
diff --git
a/git-octopus.sh
b/git-octopus.sh
index
d2471af
..
2edbf52
100755
(executable)
--- a/
git-octopus.sh
+++ b/
git-octopus.sh
@@
-4,7
+4,7
@@
#
# Resolve two or more trees recorded in $GIT_DIR/FETCH_HEAD.
#
-. git-sh-setup
|| die "Not a git archive"
+. git-sh-setup
usage () {
die "usage: git octopus"