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

diff --combined t/t4021-format-patch-numbered.sh
index 3c27f0dc19648e6c21ff4b1702f3e93f4b64755e,9b6e1be8b298f4675d77adeb84dc4c8dfb4d0c85..709b3231ca8d9da631727b4aadfb2f46049d37e9
--- 1/t/t4021-format-patch-numbered.sh
--- 2/t/t4021-format-patch-numbered.sh
+++ b/t/t4021-format-patch-numbered.sh
@@@ -86,6 -86,13 +86,13 @@@ test_expect_success 'format.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
@@@ -108,10 -115,4 +115,10 @@@ test_expect_success 'format.numbered = 
  
  '
  
 +test_expect_success '--start-number && --numbered' '
 +
 +      git format-patch --start-number 3 --numbered --stdout HEAD~1 > patch8 &&
 +      grep "^Subject: \[PATCH 3/3\]" patch8
 +'
 +
  test_done