Git FAQs - Revision history

Pjvh: /* Bring in changes from a subtree's remote */ It won't work if you only have the remote but not the branch.

2015-09-08T22:50:38Z

Bring in changes from a subtree's remote: It won't work if you only have the remote but not the branch.

← Older revision		Revision as of 18:50, 8 September 2015
Line 256:		Line 256:
	#: <pre>git checkout -b vt_branch_SWS tags/SWS</pre>		#: <pre>git checkout -b vt_branch_SWS tags/SWS</pre>

	If the ~~remote~~ is already a part of this git repo:		If the branch is already a part of this git repo:
	#Checkout the branch		#Checkout the branch
	#: <pre>git checkout libStatGen_branch</pre>		#: <pre>git checkout libStatGen_branch</pre>

Pjvh: /* Subtrees */ Format code.

2015-09-01T22:04:39Z

Subtrees: Format code.

← Older revision		Revision as of 18:04, 1 September 2015
Line 249:		Line 249:
	If the remote is not already a part of this git repo:		If the remote is not already a part of this git repo:
	#Add other project as a branch and fetch (-f).		#Add other project as a branch and fetch (-f).
	#:<~~code~~>git remote add -f libStatGen_remote https://github.com/statgen/libStatGen.git</~~code~~>		#:<pre>git remote add -f libStatGen_remote https://github.com/statgen/libStatGen.git</pre>
	#Create & checkout a branch for the remote.		#Create & checkout a branch for the remote.
	#* taking <code>master</code>:		#* taking <code>master</code>:
	#: <~~code~~>git checkout -b libStatGen_branch libStatGen_remote/master</~~code~~>		#: <pre>git checkout -b libStatGen_branch libStatGen_remote/master</pre>
	#* taking a tag:		#* taking a tag:
	#: <~~code~~>git checkout -b vt_branch_SWS tags/SWS</~~code~~>		#: <pre>git checkout -b vt_branch_SWS tags/SWS</pre>

	If the remote is already a part of this git repo:		If the remote is already a part of this git repo:
	#Checkout the branch		#Checkout the branch
	#: <~~code~~>git checkout libStatGen_branch</~~code~~>		#: <pre>git checkout libStatGen_branch</pre>
	#Bring in the new version		#Bring in the new version
	#: <~~code~~>git pull</~~code~~>		#: <pre>git pull</pre>

	=== Merge the changes from the subtree into the base repository ===		=== Merge the changes from the subtree into the base repository ===
	#Go back to the master branch		#Go back to the master branch
	#: <~~code~~>git checkout master</~~code~~>		#: <pre>git checkout master</pre>
	#(Optional) Only if adding a new subdirectory, do:		#(Optional) Only if adding a new subdirectory, do:
	#: <~~code~~>git read-tree --prefix=src/libStatGen -u libStatGen_branch</~~code~~>		#: <pre>git read-tree --prefix=src/libStatGen -u libStatGen_branch</pre>
	#Merge in the new version.		#Merge in the new version.
	#: <~~code~~>git merge --squash -s subtree --no-commit libStatGen_branch</~~code~~>		#: <pre>git merge --squash -s subtree --no-commit libStatGen_branch</pre>
	#:* --squash: do not merge histories		#:* --squash: do not merge histories
	#:* -s subtree: merge strategy		#:* -s subtree: merge strategy
	#:*--no-commit: just merge, don’t commit the changes		#:*--no-commit: just merge, don’t commit the changes
	#Commit the changes		#Commit the changes
	#: <~~code~~>git commit -m “message”</~~code~~>		#: <pre>git commit -m “message”</pre>

Pjvh: /* Subtrees */ Format instructions for using git subtrees

2015-09-01T22:01:28Z

Subtrees: Format instructions for using git subtrees

← Older revision		Revision as of 18:01, 1 September 2015
Line 246:		Line 246:

	== Subtrees ==		== Subtrees ==
	=== ~~Remote~~ is not a part of this git repo~~: Add the branch ===~~		=== Bring in changes from a subtree's remote ===
	~~Add it~~:		If the remote is not already a part of this git repo:
	#Add other project as a branch and fetch (-f)		#Add other project as a branch and fetch (-f).
	#:git remote add -f libStatGen_remote https://github.com/statgen/libStatGen.git		#:<code>git remote add -f libStatGen_remote https://github.com/statgen/libStatGen.git</code>
	#Create & checkout a branch for the remote		#Create & checkout a branch for the remote.
	#:git checkout -b libStatGen_branch libStatGen_remote/master		#* taking <code>master</code>:
			#: <code>git checkout -b libStatGen_branch libStatGen_remote/master</code>
			#* taking a tag:
			#: <code>git checkout -b vt_branch_SWS tags/SWS</code>

	~~=== Remote~~ is part of this git repo: ~~Bring in the latest version ===~~		If the remote is already a part of this git repo:
	#Checkout the branch		#Checkout the branch
	#:git checkout libStatGen_branch		#: <code>git checkout libStatGen_branch</code>
	#Bring in the new version		#Bring in the new version
	#:git pull		#: <code>git pull</code>

	=== Merge the changes from the subtree into the base repository ===		=== Merge the changes from the subtree into the base repository ===
	#Go back to the master branch		#Go back to the master branch
	#:git checkout master		#: <code>git checkout master</code>
	#(Optional) Only if adding a new subdirectory, do:		#(Optional) Only if adding a new subdirectory, do:
	#:git read-tree --prefix=src/libStatGen -u libStatGen_branch		#: <code>git read-tree --prefix=src/libStatGen -u libStatGen_branch</code>
	#Merge in the new version. --squash: do not merge histories; -s: merge strategy; --no-commit: just merge, don’t commit the changes		#Merge in the new version.
	~~#:git merge --squash -s subtree --no-commit libStatGen_branch~~		#: <code>git merge --squash -s subtree --no-commit libStatGen_branch</code>
			#:* --squash: do not merge histories
			#:* -s subtree: merge strategy
			#:*--no-commit: just merge, don’t commit the changes
	#Commit the changes		#Commit the changes
	#:git commit -m “message”		#: <code>git commit -m “message”</code>

Mktrost at 12:05, 31 October 2013

2013-10-31T12:05:38Z

← Older revision		Revision as of 08:05, 31 October 2013
Line 243:		Line 243:
	git checkout branch_you_want		git checkout branch_you_want
	git commit		git commit


			== Subtrees ==
			=== Remote is not a part of this git repo: Add the branch ===
			Add it:
			#Add other project as a branch and fetch (-f)
			#:git remote add -f libStatGen_remote https://github.com/statgen/libStatGen.git
			#Create & checkout a branch for the remote
			#:git checkout -b libStatGen_branch libStatGen_remote/master

			=== Remote is part of this git repo: Bring in the latest version ===
			#Checkout the branch
			#:git checkout libStatGen_branch
			#Bring in the new version
			#:git pull

			=== Merge the changes from the subtree into the base repository ===
			#Go back to the master branch
			#:git checkout master
			#(Optional) Only if adding a new subdirectory, do:
			#:git read-tree --prefix=src/libStatGen -u libStatGen_branch
			#Merge in the new version. --squash: do not merge histories; -s: merge strategy; --no-commit: just merge, don’t commit the changes
			#:git merge --squash -s subtree --no-commit libStatGen_branch
			#Commit the changes
			#:git commit -m “message”

Mktrost: moved Git How To to Git FAQs

2011-09-09T21:19:04Z

moved Git How To to Git FAQs

← Older revision	Revision as of 17:19, 9 September 2011
(No difference)

Mktrost: Update FAQs

2011-09-09T21:18:47Z

Update FAQs

@@ Line 35: / Line 35: @@
 #* <code>git commit -m ''Initialize the repository with all the files''</code>
 Continue to the next section if you want to create a bare repository for it to push to/pull from.
@@ Line 175: / Line 176: @@
 * git push origin ''branchName''
-== Work on a branch that exists on the remote ==
+== Work on/Use a branch that exists on the remote ==
 *To see all branches including remotes:
 ** git branch -a
 * Base work on a remote branch/merge back to it
-** git checkout --track origin/''branchName''
+** git checkout -t origin/''branchName''
 ** Creates & checkouts branch called ''branchName''
 * Now push & pull from your ''branchName''
 == Resolve a merge/pull conflict ==
@@ Line 193: / Line 198: @@
 resolved the merge
 * You can also use a mergetool: git mergetool
 == Create a tag ==
@@ Line 213: / Line 217: @@
 * Not automatically pushed to the remote
 * git push origin ''tagName''

Mktrost: /* Create a remote bare Git repository for a repository to push to/pull from */

2011-09-09T21:02:19Z

Create a remote bare Git repository for a repository to push to/pull from

← Older revision		Revision as of 17:02, 9 September 2011
Line 43:		Line 43:
	# Create the bare repository.		# Create the bare repository.
	#* <code>git init --bare --shared ''bareRepoName''</code>		#* <code>git init --bare --shared ''bareRepoName''</code>
			#** The <code>shared</code> parameter allows everyone in the same group to push to this repository. Remove that option if this is not the case.
	# cd to your repository that you want link to this bare repository.		# cd to your repository that you want link to this bare repository.
	# Set the remote.		# Set the remote.

Mktrost: /* Check Branches */

2011-09-09T20:59:19Z

Check Branches

← Older revision		Revision as of 16:59, 9 September 2011
Line 123:		Line 123:

	== Check Branches ==		== Check Branches ==
	*See what branches there are:		*See what branches there are locally:
	** git branch		** git branch
			** Current branch marked with '*'

			* To see all branches including remote branches:
			** git branch -a
	** Current branch marked with '*'		** Current branch marked with '*'

Mktrost at 20:52, 9 September 2011

2011-09-09T20:52:12Z

Show changes

Mktrost: moved Turn an already existing directory into a Git Repository to Git How To

2011-09-09T18:49:51Z

moved Turn an already existing directory into a Git Repository to Git How To

← Older revision	Revision as of 14:49, 9 September 2011
(No difference)