Merge branch 'jm/format-patch-no-auto-n-when-k-is-given' into maint
commit597a1782460085105f7530c815e79cbb1de272d9
authorJunio C Hamano <gitster@pobox.com>
Tue, 26 May 2009 02:03:52 +0000 (25 19:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 26 May 2009 02:03:52 +0000 (25 19:03 -0700)
tree88e74d5dc3af901307b4545df9c2eba0c6b5439a
parent5c44cc9ea29b74ed10f5f239791b2c2f9586f197
parentca6b91d29b7ea937b71f62bf00ba7750f3e594ce
Merge branch 'jm/format-patch-no-auto-n-when-k-is-given' into maint

* jm/format-patch-no-auto-n-when-k-is-given:
  format-patch let -k override a config-specified format.numbered
t/t4021-format-patch-numbered.sh