Code

Merge branch 'jm/format-patch-no-auto-n-when-k-is-given' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 26 May 2009 02:03:52 +0000 (19:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 26 May 2009 02:03:52 +0000 (19:03 -0700)
* jm/format-patch-no-auto-n-when-k-is-given:
  format-patch let -k override a config-specified format.numbered

1  2 
t/t4021-format-patch-numbered.sh

Simple merge