diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-11-26 00:35:20 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-26 00:35:20 (GMT) |
| commit | 93dcab2937624ebb97f91807576cddb242a55a46 (patch) | |
| tree | 8d16464f16866a7f215401a95f8bdaa124799d49 /git-octopus.sh | |
| parent | 52b6536c624b4998b3730b55b9bc3d7c4e1071a4 (diff) | |
| parent | 2a1ddc58e4d2220feea7eba4623dac07a0f83f94 (diff) | |
| download | git-0.99.9k.zip git-0.99.9k.tar.gz git-0.99.9k.tar.bz2 | |
GIT 0.99.9kv0.99.9k
This is not 1.0rc4 yet, but to push the recent fixes out.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-octopus.sh')
| -rwxr-xr-x | git-octopus.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-octopus.sh b/git-octopus.sh index d2471af..2edbf52 100755 --- 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" |