Changes for page Getting Started with Git

Summary

• Page properties (1 modified, 0 added, 0 removed)

Details

Page properties

Content

...	...	@@ -13,8 +13,8 @@
13	13
14	14	=== Git Bash Completion ===
15	15
16		-This is really an absolute necessity and a **huge** productivity improvement. Basically you need the bash completion script from the source tarball and use your shell profile to include it whenever you open a shell. Just google "git bash completion" or check out the tips here to set it up:
17		-[[Git Bash Completion>>http://superuser.com/questions/31744/how-to-get-git-completion-bash-to-work-on-mac-os-x]]
	16	+This is really an absolute necessity and a **huge** productivity improvement. Basically you need the bash completion script from the source tarball and use your shell profile to include it whenever you open a shell. See the **Auto-Completion** section on this page:
	17	+[[Git Bash Auto-Completion>>http://progit.org/book/ch2-7.html]]
18	18
19	19	=== GitX git GUI ===
20	20
...	...	@@ -104,6 +104,15 @@
104	104
105	105	# First perform an svn update as outlined above in the previous section
106	106
	107	+# Switch to the master branch
	108	+git checkout master
107	107
	110	+# Merge your working branch with the master
	111	+git merge workingbranch
108	108
	113	+# Use svn status, svn add and svn commit to commit your changes to the remote svn repository
	114	+
	115	+# Switch back to your workingbranch and get back to work.
	116	+
	117	+
109	109	{{/code}}