Merge branch 'km/doc-workflows-typofix'
commita6260826292bc00ea8829c1826b7f2f34444d2f2
authorJunio C Hamano <gitster@pobox.com>
Mon, 18 Jun 2018 17:18:42 +0000 (18 10:18 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 18 Jun 2018 17:18:42 +0000 (18 10:18 -0700)
tree2edddf662c103733b7450957731887a728866a90
parente638899470621738f32ef75dc0a092f6475a4a6e
parent58ebd936cc92441ec672b96e98ad12b34b3cb4a8
Merge branch 'km/doc-workflows-typofix'

Typofix.

* km/doc-workflows-typofix:
  gitworkflows: fix grammar in 'Merge upwards' rule
Documentation/gitworkflows.txt