[gnome-devel-docs/wip/swilmet/various-fixes] programming-guidelines: a few more explanation about git

[Sébastien Wilmet <swilmet src gnome org>]

commit 5ea5ea5c964a804c8f426d92de527970e398d0f2
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Thu Apr 16 15:40:05 2015 +0200

    programming-guidelines: a few more explanation about git
    
    - A beginner might not understand what is a forced push.
    - wip stands for work-in-progress.
    - explain why we do rebases instead of merging.
    - on git.gnome.org: wip/nickname/

 programming-guidelines/C/version-control.page |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/programming-guidelines/C/version-control.page b/programming-guidelines/C/version-control.page
index 9a050cd..1a5c86c 100644
--- a/programming-guidelines/C/version-control.page
+++ b/programming-guidelines/C/version-control.page
@@ -59,14 +59,19 @@
     </p>
     <list>
       <item><p>
-        No forced pushes.
+        No forced pushes. Except for branches with the <code>wip/</code> prefix
+        (work-in-progress), the commits' history must not be modified, as
+        contributors rely on it.
       </p></item>
       <item><p>
-        Rebase commits rather than merging.
+        Rebase commits rather than merging, to have a linear history (which is
+        easier to follow).
       </p></item>
       <item><p>
         Work on feature branches on GNOME git in <code>wip/</code> branches,
-        then rebase on master and fast-forward merge the changes.
+        then rebase on master and fast-forward merge the changes. It is a good
+        practice to also add your nickname to the branch name, as
+        <code>wip/nickname/feature</code>.
       </p></item>
       <item><p>
         Hide <link href="https://sethrobertson.github.io/GitBestPractices/#sausage";>sausage