Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
gitworkflows: fix grammar in 'Merge upwards' rule
author
Kyle Meyer
<kyle@kyleam.com>
Sat, 9 Jun 2018 15:19:43 +0000
(11:19 -0400)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 12 Jun 2018 17:19:48 +0000
(10:19 -0700)
Signed-off-by: Kyle Meyer <kyle@kyleam.com>
Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/gitworkflows.txt
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
d33c875
)
diff --git
a/Documentation/gitworkflows.txt
b/Documentation/gitworkflows.txt
index 177610e44ea31eede07035292a66b0dca167c9ae..06dcdbf40001581211af56a4a3e70ea1a49433b8 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.
=====================================