diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-06-24 08:06:51 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-24 08:06:51 (GMT) |
| commit | bc1f262d67cbe1c736c5dca911f6f085f47ac9bb (patch) | |
| tree | 09d2fd4312b16cb841238edd2b5ad3a10b6f5263 /Documentation/merge-options.txt | |
| parent | 1f330269371cc77b7abfcc99c7b15ad7b86f09c9 (diff) | |
| parent | ce88ac5b129dd562a1062522039366ebbf1157e1 (diff) | |
| download | git-bc1f262d67cbe1c736c5dca911f6f085f47ac9bb.zip git-bc1f262d67cbe1c736c5dca911f6f085f47ac9bb.tar.gz git-bc1f262d67cbe1c736c5dca911f6f085f47ac9bb.tar.bz2 | |
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 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions