summaryrefslogtreecommitdiff
path: root/git-reset.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-06-24 01:06:51 -0700
committerJunio C Hamano <junkio@cox.net>2006-06-24 01:06:51 -0700
commitbc1f262d67cbe1c736c5dca911f6f085f47ac9bb (patch)
tree09d2fd4312b16cb841238edd2b5ad3a10b6f5263 /git-reset.sh
parent1f330269371cc77b7abfcc99c7b15ad7b86f09c9 (diff)
parentce88ac5b129dd562a1062522039366ebbf1157e1 (diff)
downloadgit-bc1f262d67cbe1c736c5dca911f6f085f47ac9bb.tar.gz
Merge branch 'pb/error'
* pb/error: usage: minimum type fix. Customizable error handlers git-merge: Don't use -p when outputting summary git-commit: allow -e option anywhere on command line patch-id: take "commit" prefix as well as "diff-tree" prefix
Diffstat (limited to 'git-reset.sh')
0 files changed, 0 insertions, 0 deletions