diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-06-24 01:06:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-24 01:06:51 -0700 |
| commit | bc1f262d67cbe1c736c5dca911f6f085f47ac9bb (patch) | |
| tree | 09d2fd4312b16cb841238edd2b5ad3a10b6f5263 /git-merge.sh | |
| parent | 1f330269371cc77b7abfcc99c7b15ad7b86f09c9 (diff) | |
| parent | ce88ac5b129dd562a1062522039366ebbf1157e1 (diff) | |
| download | git-bc1f262d67cbe1c736c5dca911f6f085f47ac9bb.tar.gz git-bc1f262d67cbe1c736c5dca911f6f085f47ac9bb.tar.xz | |
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-merge.sh')
| -rwxr-xr-x | git-merge.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge.sh b/git-merge.sh index af1f25b3c..da5657eb4 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -55,7 +55,7 @@ finish () { case "$no_summary" in '') - git-diff-tree -p --stat --summary -M "$head" "$1" + git-diff-tree --stat --summary -M "$head" "$1" ;; esac } |