X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=pep-git.txt;h=db703eb15e3f69c2e1ee31bfc9b72b000b5c95ed;hb=0f336f194e546c229b2ff7cbac92910a4bb749f6;hp=acc45f3b1db00a1f822193502921e59a58e72ff7;hpb=dc2077abaca44e962f57e2f5424bb6c8f7403379;p=git-wiki.git

diff --git a/pep-git.txt b/pep-git.txt
index acc45f3..db703eb 100644
--- a/pep-git.txt
+++ b/pep-git.txt
@@ -7,7 +7,7 @@ Status: Draft
 Type: Informational
 Content-Type: text/x-rst
 Created: 01-Jun-2015
-Post-History: 
+Post-History: 12-Sep-2015
 
 Abstract
 ========
@@ -43,7 +43,7 @@ Git Tutorial: `part 1
 `Git User's manual
 <https://www.kernel.org/pub/software/scm/git/docs/user-manual.html>`_.
 `Everyday GIT With 20 Commands Or So
-<https://www.kernel.org/pub/software/scm/git/docs/everyday.html>`_.
+<https://www.kernel.org/pub/software/scm/git/docs/giteveryday.html>`_.
 `Git workflows
 <https://www.kernel.org/pub/software/scm/git/docs/gitworkflows.html>`_.
 
@@ -628,6 +628,33 @@ Git has a builtin merge strategy for what Python core developers call
     $ git merge -s ours v1  # null-merge v1 into master
 
 
+Branching models
+================
+
+Git doesn't assume any particular development model regarding
+branching and merging. Some projects prefer to graduate patches from
+the oldest branch to the newest, some prefer to cherry-pick commits
+backwards, some use squashing (combining a number of commits into
+one). Anything is possible.
+
+There are a few examples to start with. `git help workflows
+<https://www.kernel.org/pub/software/scm/git/docs/gitworkflows.html>`_
+describes how the very git authors develop git.
+
+ProGit book has a few chapters devoted to branch management in
+different projects: `Git Branching - Branching Workflows
+<https://git-scm.com/book/en/Git-Branching-Branching-Workflows>`_ and
+`Distributed Git - Contributing to a Project
+<https://git-scm.com/book/en/Distributed-Git-Contributing-to-a-Project>`_.
+
+There is also a well-known article `A successful Git branching model
+<http://nvie.com/posts/a-successful-git-branching-model/>`_ by Vincent
+Driessen. It recommends a set of very detailed rules on creating and
+managing mainline, topic and bugfix branches. To support the model the
+author implemented `git flow <https://github.com/nvie/gitflow>`_
+extension.
+
+
 Advanced configuration
 ======================
 
@@ -878,10 +905,10 @@ it was known under the name ``hg2git``).
 
 But a better tool, perhaps the best, is `git-remote-hg
 <https://github.com/felipec/git-remote-hg>`_. It provides transparent
-bidirectional access (pull and push) to Mercurial repositories from
+bidirectional (pull and push) access to Mercurial repositories from
 git. Its author wrote a `comparison of alternatives
 <https://github.com/felipec/git/wiki/Comparison-of-git-remote-hg-alternatives>`_
-that seems to be mostly unbiased.
+that seems to be mostly objective.
 
 To use git-remote-hg, install or clone it, add to your PATH (or copy
 script ``git-remote-hg`` to a directory that's already in PATH) and
@@ -901,6 +928,10 @@ At the second half of the page there is a table that lists
 corresponding Mercurial and git commands. Should work perfectly in
 both directions.
 
+Python Developer's Guide also has a chapter `Mercurial for git
+developers <https://docs.python.org/devguide/gitdevs.html>`_ that
+documents a few differences between git and hg.
+
 
 Copyright
 =========