Recent changes to Git

Git modified by Oliver Schmitz

Oliver Schmitz — Wed, 05 Nov 2014 12:46:10 -0000

--- v10
+++ v11
@@ -49,8 +49,8 @@
     git tag -a v2.0.1 -m"Blahdiblah"

     # Tag a PCRaster version (lightweight tag):
-    git tag 4.0.1
+    git tag pcraster-4.0.1

     # Push the tags:
     git push origin v2.0.1
-    git push origin 4.0.1
+    git push origin pcraster-4.0.1

Git modified by Kor de Jong

Kor de Jong — Wed, 26 Mar 2014 12:42:14 -0000

--- v9
+++ v10
@@ -29,6 +29,12 @@

     git checkout bug/sf605

+Rebase bug fix branches, at least once, before merging into the feature branch.
+    git rebase 4.0
+
+DON'T merge with conflicts. Handle conflicts upon rebasing.
+
+
 Visualize commit, merge, branch history of current branch. You may want to grep for specific tags.

     git log --oneline --decorate --graph

Git modified by Kor de Jong

Kor de Jong — Wed, 26 Mar 2014 09:34:44 -0000

--- v8
+++ v9
@@ -1,4 +1,6 @@
 We use a simple branching model. The main branch (master) represents the code that will be in the next feature release (x.y). When released, the last commit is tagged. A branch is created for the feature release (named x.y), and it collects the bug fixes for the bug fix releases (x.y.1, x.y.2, etc). Meanwhile, the master collects new features for the next feature release.
+
+- https://gist.github.com/jbenet/ee6c9ac48068889b0912

 Setup projects
 ==============

Git modified by Kor de Jong

Kor de Jong — Fri, 21 Mar 2014 12:48:19 -0000

--- v7
+++ v8
@@ -42,3 +42,7 @@

     # Tag a PCRaster version (lightweight tag):
     git tag 4.0.1
+
+    # Push the tags:
+    git push origin v2.0.1
+    git push origin 4.0.1

Git modified by Kor de Jong

Kor de Jong — Fri, 21 Mar 2014 12:46:11 -0000

--- v6
+++ v7
@@ -34,3 +34,11 @@
 Merge a bug-fix branch with the release branch, This assumes the release branch is checked out.

     git merge --no-ff bug/sf605
+
+Tag:
+
+    # Tag a project (annotated tag):
+    git tag -a v2.0.1 -m"Blahdiblah"
+
+    # Tag a PCRaster version (lightweight tag):
+    git tag 4.0.1

Git modified by Kor de Jong

Kor de Jong — Wed, 19 Mar 2014 10:45:05 -0000

--- v5
+++ v6
@@ -2,21 +2,21 @@

 Setup projects
 ==============
-When fixing a bug, make sure that all PCRaster project have their bug fix branch checked out.
+When fixing a bug, make sure that all PCRaster project have their release branches checked out.

 Git
 ===
 Create a new branch:

-    # Branch for bug fixes.
+    # Release branch.
     # Make sure commit with tag 4.0.0 is checked out.
-    # A general bug fix branch only needs to be created once.
+    # A release branch only needs to be created once.
     git checkout -b 4.0 

-    # Branch for a specific bug fix.
-    # Make sure branch 4.0 is checked out.
-    # Create a bug fix branch for each bug.
+    # Bug-fix branch.
+    # Make sure release branch is checked out.
+    # Create a bug-fix branch for each bug.
     git branch bug/sf605

 Push a branch to server, setup branch tracking:
@@ -31,6 +31,6 @@

     git log --oneline --decorate --graph

-Merge a bug fix branch with the general bug fix branch, This assumes this general bug fix branch is checked out.
+Merge a bug-fix branch with the release branch, This assumes the release branch is checked out.

     git merge --no-ff bug/sf605

Git modified by Kor de Jong

Kor de Jong — Mon, 24 Feb 2014 13:45:13 -0000

--- v4
+++ v5
@@ -12,7 +12,7 @@
     # Branch for bug fixes.
     # Make sure commit with tag 4.0.0 is checked out.
     # A general bug fix branch only needs to be created once.
-    git branch 4.0
+    git checkout -b 4.0 

     # Branch for a specific bug fix.
     # Make sure branch 4.0 is checked out.

Git modified by Kor de Jong

Kor de Jong — Wed, 29 Jan 2014 14:20:12 -0000

--- v3
+++ v4
@@ -1,5 +1,12 @@
 We use a simple branching model. The main branch (master) represents the code that will be in the next feature release (x.y). When released, the last commit is tagged. A branch is created for the feature release (named x.y), and it collects the bug fixes for the bug fix releases (x.y.1, x.y.2, etc). Meanwhile, the master collects new features for the next feature release.

+Setup projects
+==============
+When fixing a bug, make sure that all PCRaster project have their bug fix branch checked out.
+
+
+Git
+===
 Create a new branch:

     # Branch for bug fixes.

Git modified by Kor de Jong

Kor de Jong — Wed, 29 Jan 2014 08:49:47 -0000

--- v2
+++ v3
@@ -3,12 +3,16 @@
 Create a new branch:

     # Branch for bug fixes.
+    # Make sure commit with tag 4.0.0 is checked out.
+    # A general bug fix branch only needs to be created once.
     git branch 4.0

     # Branch for a specific bug fix.
+    # Make sure branch 4.0 is checked out.
+    # Create a bug fix branch for each bug.
     git branch bug/sf605

-Push branch to server:
+Push a branch to server, setup branch tracking:

     git push -u origin bug/sf605

@@ -16,6 +20,10 @@

     git checkout bug/sf605

-
+Visualize commit, merge, branch history of current branch. You may want to grep for specific tags.

     git log --oneline --decorate --graph
+
+Merge a bug fix branch with the general bug fix branch, This assumes this general bug fix branch is checked out.
+
+    git merge --no-ff bug/sf605

Git modified by Kor de Jong

Kor de Jong — Tue, 28 Jan 2014 10:09:40 -0000

--- v1
+++ v2
@@ -15,3 +15,7 @@
 Checkout branch:

     git checkout bug/sf605
+
+
+
+    git log --oneline --decorate --graph