![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Sat, 24 Jun 2006 08:06:51 +0000 (01:06 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sat, 24 Jun 2006 08:06:51 +0000 (01:06 -0700) | ||
| commit | bc1f262d67cbe1c736c5dca911f6f085f47ac9bb | |
| tree | 09d2fd4312b16cb841238edd2b5ad3a10b6f5263 | tree | snapshot |
| parent | 1f330269371cc77b7abfcc99c7b15ad7b86f09c9 | commit | diff |
| parent | ce88ac5b129dd562a1062522039366ebbf1157e1 | commit | diff |
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
* 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