Git Branch Management - Revision history

Wes: /* Getting Started */ link to code

2011-07-15T17:42:19Z

‎Getting Started: link to code

2011-06-30T00:29:16Z

‎nspatchapply

2011-06-27T23:56:17Z

‎nsrollup: reference newer git fetch/rebase/merge process

2011-06-17T21:34:49Z

‎Stopping Merging During Release-Candidates

2011-06-17T21:28:59Z

@@ Line 5: / Line 5: @@
 The bash aliases require that you source the local/gittools/shell-functions in order to get started:
-   # '''. ./local/gittools/shell-functions'''
+   # '''. ./{{code|local/gittools/shell-functions}}'''
 Once this is done, the rest of the commands on this page will work.

← Older revision		Revision as of 00:29, 30 June 2011
Line 89:		Line 89:

	Done! Wasn't that easy?		Done! Wasn't that easy?
		+
		+	If you already have changes on one branch and need to move them, you might read the [[Moving changes on a Git branch]] web page for moving already committed changes.

	== Git Repository Management ==		== Git Repository Management ==

@@ Line 98: / Line 98: @@
 The '''nsrollup''' bash function performs the following tasks on a clean tree:
-# performs a ''git pull --all'' to ensure your branches are up to date
+# performs a ''git fetch --all'' to ensure your branches are up to date
 # checks out each branch
 # merges the direct previous version into it (eg, it'll roll V5-4-patches into V5-5-patches)
 # lets you know about conflicts that you need to resolve

← Older revision		Revision as of 21:34, 17 June 2011
Line 147:		Line 147:

	Will cause it to be ignored for merging. Changes in V5-6-patches will still be rolled into V5-7-patches, though (which will often include changes to the ''dist/release'' file itself; but that's ok. It can list multiple releases if need be).		Will cause it to be ignored for merging. Changes in V5-6-patches will still be rolled into V5-7-patches, though (which will often include changes to the ''dist/release'' file itself; but that's ok. It can list multiple releases if need be).
		+
		+	=== Checking the pretty results tree ===
		+
		+	The [[gitk]] tool is highly useful (with the --all switch) for showing the resulting prettiness that you just created. For example, in the above examples it produced a bunch of merges that are shown graphically as follows:
		+
		+	[[Image:gitkexample.jpg]]

	[[Category:Git]]		[[Category:Git]]

← Older revision		Revision as of 21:28, 17 June 2011
Line 1:		Line 1:
−	Net-SNMP has a number of scripts or shell functions which help manage a git-repo. Specifically, we have a bunch of tools that help test [[Patches\|patches]], apply patches and perform upward merges based on our [[Git Workflow]].	+	Net-SNMP has a number of scripts or shell functions which help manage a git-repo. Specifically, we have a bunch of tools that help test [[Patches\|patches]], apply patches and perform upward merges based on our [[Git Workflow]]. It augments the more day-to-day [[Git For Developers]] with detailed project-management issues.

	== Getting Started ==		== Getting Started ==