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-reset.sh
diff --git
a/git-reset.sh
b/git-reset.sh
index
2086d26
..
72ef303
100755
(executable)
--- a/
git-reset.sh
+++ b/
git-reset.sh
@@
-1,5
+1,5
@@
#!/bin/sh
-. git-sh-setup
|| die "Not a git archive"
+. git-sh-setup
usage () {
die 'Usage: git reset [--mixed | --soft | --hard] [<commit-ish>]'