This should be a less scary series of patches for gitopt.
[PATCH 1/5] gitopt: a new command-line option parser for git
[PATCH 2/5] gitopt: convert ls-files, ls-tree, update-index
Simple conversions.
[PATCH 3/5] gitopt: convert setup_revisions() and friends
This one is pretty big, some extra testing + review would be
nice.
[PATCH 4/5] commit: allow --pretty= args to be abbreviated
Not strictly related to gitopt, but finger-friendly nevertheless.
[PATCH 5/5] diff: parse U/u/unified options with an optional integer arg
Originally, this was bundled into:
<11471512123005-git-send-email-normalperson@yhbt.net>,
Then Linus did a more correct one that didn't forget combine-diff:
<Pine.LNX.4.64.0605131317200.3866@g5.osdl.org>
This one combines both of them.