From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 5 Mar 2009 23:41:43 +0000 (-0800)
Subject: Merge branch 'ns/pretty-format'
X-Git-Tag: v1.6.3-rc0~203
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=458eaf5bf895c2df8e0ef81a4c9606d179082e68;p=git.git

Merge branch 'ns/pretty-format'

* ns/pretty-format:
  bash completion: add --format= and --oneline options for "git log"
  Add tests for git log --pretty, --format and --oneline.
  Add --oneline that is a synonym to "--pretty=oneline --abbrev-commit"
  Give short-hands to --pretty=tformat:%formatstring
  Add --format that is a synonym to --pretty
---

458eaf5bf895c2df8e0ef81a4c9606d179082e68