summaryrefslogtreecommitdiff
path: root/Documentation/gitworkflows.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-07-18 16:35:21 -0700
committerJunio C Hamano <gitster@pobox.com>2020-07-18 16:35:22 -0700
commit00a7a21b97a47889cf66de32f8defed023c14c2c (patch)
treecf944a27143883120cb0e3b6b94710eee8f9bc1f /Documentation/gitworkflows.txt
parentd400cb0d1ba45c8f17b132b50b7685614af8505c (diff)
parentca8bb509d23e9a6299eddc88905be2b5d8f1b37a (diff)
downloadgit-00a7a21b97a47889cf66de32f8defed023c14c2c.tar.xz
Merge branch 'js/pu-to-seen' into master
Last minute fix-up to documentation. * js/pu-to-seen: gitworkflows.txt: fix broken subsection underline
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