Skip to content

Commit f2ea601

Browse files
csabellaMariatta
authored andcommitted
Mention how to checkout the maintenance branch (pythonGH-250)
1 parent 8b9e729 commit f2ea601

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

gitbootcamp.rst

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,11 @@ To switch to a different branch::
7676

7777
$ git checkout <another-branch-name>
7878

79+
Other releases are just branches in the repository. For example, to work
80+
on the 2.7 release::
81+
82+
$ git checkout -b 2.7 origin/2.7
83+
7984

8085
Deleting Local Branches
8186
-----------------------
@@ -222,16 +227,16 @@ Solution:
222227
2. Apply the patch::
223228

224229
$ git apply /path/to/issueNNNN-git.patch
225-
230+
226231
If there are errors, update to a revision from when the patch was
227232
created and then try the ``git apply`` again::
228233

229234
$ git checkout `git rev-list -n 1 --before="yyyy-mm-dd hh:mm:ss" master`
230235
$ git apply /path/to/issueNNNN-git.patch
231-
236+
232237
If the patch still won't apply, then a patch tool will not be able to
233238
apply the patch and it will need to be re-implemented manually.
234-
239+
235240
3. If the apply was successful, create a new branch and switch to it.
236241

237242
4. Stage and commit the changes.
@@ -259,7 +264,7 @@ Scenario:
259264
On Unix and MacOS, set up the following git alias::
260265

261266
$ git config --global alias.pr '!sh -c "git fetch upstream pull/${1}/head:pr_${1} && git checkout pr_${1}" -'
262-
267+
263268
On Windows, reverse the single (`'`) and double (`"`) quotes::
264269

265270
git config --global alias.pr "!sh -c 'git fetch upstream pull/${1}/head:pr_${1} && git checkout pr_${1}' -"

0 commit comments

Comments
 (0)