delta/git.git/Documentation, branch mf/no-dashed-subcommands github.com: git/git.git Git 2.14 2017-08-04T16:31:12+00:00 Junio C Hamano gitster@pobox.com 2017-08-04T16:31:12+00:00 4384e3cde2ce8ecd194202e171ae16333d241326 Signed-off-by: Junio C Hamano <gitster@pobox.com> 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'ah/patch-id-doc' 2017-08-04T16:29:15+00:00 Junio C Hamano gitster@pobox.com 2017-08-04T16:29:15+00:00 62ebe03b9e8d5a6a37ea2b726d64b109aec0508c Docfix. * ah/patch-id-doc: doc: remove unsupported parameter from patch-id 
Docfix.

* ah/patch-id-doc:
  doc: remove unsupported parameter from patch-id
Merge branch 'as/diff-options-grammofix' 2017-08-04T16:29:14+00:00 Junio C Hamano gitster@pobox.com 2017-08-04T16:29:14+00:00 ddd1133c5e1c549ff9b73c6aafc16460dcf3570e A grammofix. * as/diff-options-grammofix: diff-options doc: grammar fix 
A grammofix.

* as/diff-options-grammofix:
  diff-options doc: grammar fix
Sync with maint 2017-07-31T20:52:53+00:00 Junio C Hamano gitster@pobox.com 2017-07-31T20:52:53+00:00 e2d9c46130247dd31d0421d2b2fc4bfd014c085e * maint: Preparation for 2.13.4 continues 
* maint:
  Preparation for 2.13.4 continues
Preparation for 2.13.4 continues 2017-07-31T20:52:40+00:00 Junio C Hamano gitster@pobox.com 2017-07-31T20:52:40+00:00 c94ef190411ca35f2445ff63488458650faa5d8b Signed-off-by: Junio C Hamano <gitster@pobox.com> 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'ks/doc-fixes' into maint 2017-07-31T20:51:06+00:00 Junio C Hamano gitster@pobox.com 2017-07-31T20:51:06+00:00 0baf0b839b45ed06ef560e3b035315ecff0d4bef Doc clean-up. * ks/doc-fixes: doc: reformat the paragraph containing the 'cut-line' doc: camelCase the i18n config variables to improve readability 
Doc clean-up.

* ks/doc-fixes:
  doc: reformat the paragraph containing the 'cut-line'
  doc: camelCase the i18n config variables to improve readability
diff-options doc: grammar fix 2017-07-31T16:57:12+00:00 Anthony Sottile asottile@umich.edu 2017-07-31T14:00:31+00:00 bc9b7e207f4bca81bd6aa46a078aa9f87017dc06 Signed-off-by: Anthony Sottile <asottile@umich.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> 
Signed-off-by: Anthony Sottile <asottile@umich.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
doc: remove unsupported parameter from patch-id 2017-07-28T21:41:32+00:00 Andreas Heiduk asheiduk@gmail.com 2017-07-27T22:46:16+00:00 ac05222b31954527f4342d3b7a15c3c8d5bd01c6 The patch is read from standard input and not from a parameter. Signed-off-by: Andreas Heiduk <asheiduk@gmail.com> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 
The patch is read from standard input and not from a parameter.

Signed-off-by: Andreas Heiduk <asheiduk@gmail.com>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Sync with maint 2017-07-21T22:13:25+00:00 Junio C Hamano gitster@pobox.com 2017-07-21T22:13:25+00:00 5eada8987e79f216f2002a3cd991360a50cd577c * maint: fixes from 'master' for 2.13.4 
* maint:
  fixes from 'master' for 2.13.4
fixes from 'master' for 2.13.4 2017-07-21T22:06:09+00:00 Junio C Hamano gitster@pobox.com 2017-07-21T22:06:09+00:00 2187e112d719109cac64d39e1bd8a04b123b6eed Signed-off-by: Junio C Hamano <gitster@pobox.com> 
Signed-off-by: Junio C Hamano <gitster@pobox.com>