diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-06-18 10:18:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-18 10:18:42 -0700 |
| commit | a6260826292bc00ea8829c1826b7f2f34444d2f2 (patch) | |
| tree | 2edddf662c103733b7450957731887a728866a90 /Documentation/gitworkflows.txt | |
| parent | e638899470621738f32ef75dc0a092f6475a4a6e (diff) | |
| parent | 58ebd936cc92441ec672b96e98ad12b34b3cb4a8 (diff) | |
| download | git-a6260826292bc00ea8829c1826b7f2f34444d2f2.tar.gz | |
Merge branch 'km/doc-workflows-typofix'
Typofix.
* km/doc-workflows-typofix:
gitworkflows: fix grammar in 'Merge upwards' rule
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 926e044d09..ca11c7bdaf 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. ===================================== |