Merge branch 'bg/format-patch-doc-update'
commit1a02a85d63f280ffaec6977ed2365be92cb80287
authorJunio C Hamano <gitster@pobox.com>
Sat, 21 Nov 2009 07:47:10 +0000 (20 23:47 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 21 Nov 2009 07:47:10 +0000 (20 23:47 -0800)
treefc0cb889551b7c6f297a7a72508357397a4de451
parentaa437791d8b3d5a163777d1cabd1f299654ce712
parent2cfa8330e414bc73b01d45f232f8566afc56dd10
Merge branch 'bg/format-patch-doc-update'

* bg/format-patch-doc-update:
  format-patch: Add "--no-stat" as a synonym for "-p"
  format-patch documentation: Fix formatting
  format-patch documentation: Remove diff options that are not useful
  format-patch: Always generate a patch
Documentation/diff-options.txt
builtin-log.c