Skip to main content

Browse the archive

Staging
v0.5.2
https://github.com/git/git
23 January 2022, 05:21:09 UTC
Revision 0d214b6619bf14a6409a2a1ba079f3530d40ee41 authored by Fredrik Kuivinen on 13 September 2005, 21:40:23 UTC, committed by Junio C Hamano on 13 September 2005, 22:45:24 UTC 
[PATCH] Don't output 'Automatic merge failed, ...'
 
git-merge.sh does this for us.

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent d9a23fa
Raw File
Tip revision: 0d214b6619bf14a6409a2a1ba079f3530d40ee41 authored by Fredrik Kuivinen on 13 September 2005, 21:40:23 UTC
[PATCH] Don't output 'Automatic merge failed, ...'
Tip revision: 0d214b6
git.sh 
#!/bin/sh

cmd=
path=$(dirname $0)
case "$#" in
0)	;;
*)	cmd="$1"
	shift
	case "$cmd" in
	-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
		echo "git version @@GIT_VERSION@@"
		exit 0 ;;
	esac
	test -x $path/git-$cmd && exec $path/git-$cmd "$@" ;;
esac

echo "Usage: git COMMAND [OPTIONS] [TARGET]"
if [ -n "$cmd" ]; then
    echo " git command '$cmd' not found: commands are:"
else
    echo " git commands are:"
fi

cat <<\EOF
    add apply archimport bisect branch checkout cherry clone
    commit count-objects cvsimport diff fetch format-patch
    fsck-cache get-tar-commit-id init-db log ls-remote octopus
    pack-objects parse-remote patch-id prune pull push rebase
    relink rename repack request-pull reset resolve revert
    send-email shortlog show-branch status tag verify-tag
    whatchanged
EOF
back to top