Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'km/doc-workflows-typofix'
author
Junio C Hamano
<gitster@pobox.com>
Mon, 18 Jun 2018 17:18:42 +0000
(10:18 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 18 Jun 2018 17:18:42 +0000
(10:18 -0700)
Typofix.
* km/doc-workflows-typofix:
gitworkflows: fix grammar in 'Merge upwards' rule
Documentation/gitworkflows.txt
patch
|
blob
|
history
raw
(from parent 1:
e638899
)
diff --git
a/Documentation/gitworkflows.txt
b/Documentation/gitworkflows.txt
index 926e044d098bc1399c923c4f204bca5d4a7a37bf..ca11c7bdafb91bc2f6ae71ca18a2f6b45e5f38b0 100644
(file)
--- a/
Documentation/gitworkflows.txt
+++ b/
Documentation/gitworkflows.txt
@@
-107,7
+107,7
@@
the unstable branch into the stable one. Hence the following:
.Merge upwards
[caption="Rule: "]
=====================================
-Always commit your fixes to the oldest supported branch that require
+Always commit your fixes to the oldest supported branch that require
s
them. Then (periodically) merge the integration branches upwards into each
other.
=====================================