![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 14 Oct 2010 03:23:08 +0000 (20:23 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 14 Oct 2010 03:23:08 +0000 (20:23 -0700) | ||
| commit | 53ea256ab9071d54b4f09772408e442ad43bc73a | |
| tree | 48dddb793b2a9416f8409e2629ea346e7846688a | tree | snapshot |
| parent | aa2fac1bf72f06a49fc41db96b7985f88fec9617 | commit | diff |
| parent | d0bb13663000be47d83cbe53b6c4bdc8835625cb | commit | diff |
Merge branch 'sn/doc-opt-notation' into next
* sn/doc-opt-notation:
Fix {update,checkout}-index usage strings
Put a space between `<' and argument in pack-objects usage string
Remove stray quotes in --pretty and --format documentation
Use parentheses and `...' where appropriate
Fix odd markup in --diff-filter documentation
Use angles for placeholders consistently
Conflicts:
Documentation/git-repack.txt
Documentation/merge-strategies.txt
* sn/doc-opt-notation:
Fix {update,checkout}-index usage strings
Put a space between `<' and argument in pack-objects usage string
Remove stray quotes in --pretty and --format documentation
Use parentheses and `...' where appropriate
Fix odd markup in --diff-filter documentation
Use angles for placeholders consistently
Conflicts:
Documentation/git-repack.txt
Documentation/merge-strategies.txt
13 files changed: