Git Workflow - Revision history

Wes: removed proposed flag; we're in production with it at this point

2012-03-05T19:20:58Z

removed proposed flag; we're in production with it at this point

Wes: mention merge --log

2011-07-15T17:41:50Z

mention merge --log

Wes: /* Policy Overview */

2011-06-17T21:17:35Z

‎Policy Overview

Wes at 20:33, 17 June 2011

2011-06-17T20:33:44Z

Wes: /* Applying Patch #1 */

2011-04-22T14:57:07Z

‎Applying Patch #1

← Older revision		Revision as of 19:20, 5 March 2012
Line 1:		Line 1:
−	~~{{Proposed}}~~
−
	This page describes the Net-SNMP [[Git]] Workflow. Using the contents of this page, users should be able to learn how to create patches and developers can learn how to manage changes to the Net-SNMP Git Tree.		This page describes the Net-SNMP [[Git]] Workflow. Using the contents of this page, users should be able to learn how to create patches and developers can learn how to manage changes to the Net-SNMP Git Tree.

@@ Line 49: / Line 49: @@
    # git checkout V5-4-patches
-   # git merge V5-3-patches
+   # git merge --log V5-3-patches
 [[Image:Git-Workflow-T2.png|400px|After p1 upward1]]
@@ Line 60: / Line 60: @@
    # git checkout V5-5-patches
-   # git merge V5-4-patches
+   # git merge --log V5-4-patches
 [[Image:Git-Workflow-T3.png|400px|After p1 upward2]]
@@ Line 88: / Line 88: @@
    # git checkout V5-5-patches
-   # git merge V5-4-patches
+   # git merge --log V5-4-patches
    # git checkout V5-6-patches
-   # git merge V5-5-patches
+   # git merge --log V5-5-patches
 [[Image:Git-Workflow-T6.png|400px|After 2 merges]]
@@ Line 99: / Line 99: @@
    # git checkout V5-4-patches
-   # git merge V5-3-patches
+   # git merge --log V5-3-patches
    # git checkout V5-5-patches
-   # git merge V5-4-patches
+   # git merge --log V5-4-patches
    # git checkout V5-6-patches
-   # git merge V5-5-patches
+   # git merge --log V5-5-patches
    # git checkout master
-   # git merge V5-6-patches
+   # git merge --log V5-6-patches
 [[Image:Git-Workflow-T7.png|400px|After all merges]]
@@ Line 169: / Line 169: @@
 Starting with merging feature1 back into the trunk is easy!  Git takes care of the complexities.
-   # git merge feature1
+   # git merge --log feature1
 [[Image:Git-Workflow-F4.png|400px|merge of feature1]]
@@ Line 181: / Line 181: @@
 If you do a merge just like with feature1, it should work and pull in only the new changes:
-   # git merge feature2
+   # git merge --log feature2
 [[Image:Git-Workflow-F5.1.png|400px|merge from here]]
@@ Line 193: / Line 193: @@
    # git rebase master
    # git checkout master
-   # git merge feature2
+   # git merge --log feature2
 [[Image:Git-Workflow-F5.2.png|400px|merge from there]]
@@ Line 207: / Line 207: @@
    # git commit -m "Feature2 is now super super cool"
    # git checkout master
-   # git merge feature2
+   # git merge --log feature2
 [[Image:Git-Workflow-F5.3.png|400px|feature creep]]
@@ Line 241: / Line 241: @@
 # git commit -m "applying a patch to fix Wes' broken code"
 # git checkout master
-# git merge V5-6-patches
+# git merge --log V5-6-patches
 </pre>

@@ Line 14: / Line 14: @@
 # New feature branches should always be based off of the ''master'' branch
 #* features that require other new features that haven't been merged themselves may need to root off of the other feature until they get merged into the master.
 == Managing patches in the Git Tree ==

← Older revision		Revision as of 20:33, 17 June 2011
Line 247:		Line 247:

	I mean, come on... merging that many branches upward is a lot of typing!		I mean, come on... merging that many branches upward is a lot of typing!
−	: Yes, Virginia, we~~'ll be creating~~ scripts to help automate frequent tasks like merging between multiple branches.	+	: Yes, Virginia, we [[Git Branch Management\|have scripts to help automate frequent tasks like merging between multiple branches]].
		+
		+	[[Category:Git]]

@@ Line 26: / Line 26: @@
 === Applying Patch #1 ===
-In SVN developers were encouraged to commit fixes to all the branches at once.  This will be a major change when switching to Git.  Patches should be applied to the earliest branch they're relevant for.  Note that git makes it easy to switch branches with a current change still in place, see below in section [[[#XXX]]] of this page.
+In SVN developers were encouraged to commit fixes to all the branches at once.  This will be a major change when switching to Git.  Patches should be applied to the earliest branch they're relevant for.  Note that git makes it easy to switch branches with a current change still in place, see below in section [[#Figuring_out_which_branch_to_apply_to]] of this page.
 In this example, we're applying patch ''p1'' to an early branch: