Merge branch 'jm/format-patch-no-auto-n-when-k-is-given'

* jm/format-patch-no-auto-n-when-k-is-given:
  format-patch let -k override a config-specified format.numbered
This commit is contained in:
Junio C Hamano
2009-05-23 01:40:22 -07:00
2 changed files with 20 additions and 1 deletions

View File

@@ -86,6 +86,13 @@ test_expect_success 'format.numbered && --no-numbered' '
'
test_expect_success 'format.numbered && --keep-subject' '
git format-patch --keep-subject --stdout HEAD^ >patch4a &&
grep "^Subject: Third" patch4a
'
test_expect_success 'format.numbered = auto' '
git config format.numbered auto