summaryrefslogtreecommitdiff
path: root/Documentation/gitworkflows.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/gitworkflows.txt')
-rw-r--r--Documentation/gitworkflows.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/gitworkflows.txt b/Documentation/gitworkflows.txt
index 2db7ba7842..47cf97f9be 100644
--- a/Documentation/gitworkflows.txt
+++ b/Documentation/gitworkflows.txt
@@ -292,7 +292,7 @@ described in the previous section.
Branch management for next and seen after a feature release
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
After a feature release, the integration branch 'next' may optionally be
rewound and rebuilt from the tip of 'master' using the surviving