diff options
| author | Kyle Meyer <kyle@kyleam.com> | 2018-06-09 11:19:43 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-12 10:19:48 -0700 |
| commit | 58ebd936cc92441ec672b96e98ad12b34b3cb4a8 (patch) | |
| tree | e4bc9835041d7f47201b0b3df4b003e1b02f3c1f /Documentation/gitworkflows.txt | |
| parent | d33c87517a85f544159b2efa406136dde18a5b9f (diff) | |
| download | git-58ebd936cc92441ec672b96e98ad12b34b3cb4a8.tar.gz | |
gitworkflows: fix grammar in 'Merge upwards' rule
Signed-off-by: Kyle Meyer <kyle@kyleam.com>
Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/gitworkflows.txt')
| -rw-r--r-- | Documentation/gitworkflows.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/gitworkflows.txt b/Documentation/gitworkflows.txt index 177610e44e..06dcdbf400 100644 --- 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 requires them. Then (periodically) merge the integration branches upwards into each other. ===================================== |