Git - Revision history

Kevin: /* Usage */

2015-03-31T10:43:36Z

Usage

← Older revision		Revision as of 10:43, 31 March 2015
Line 515:		Line 515:

	* Done! Add the remote repo info if necessary.		* Done! Add the remote repo info if necessary.


			== Multiple Remote Repositories ==

			=== Push ===
			==== Add more remote repository (origin) for <code>push</code> ====
			<pre>
			git remote set-url origin --add git@github.com:YOUR_USERNAME/your_project.git
			</pre>

			=== Pull ===
			==== Add remote repository info for <code>pull</code> ====
			<pre>
			git remote add github git@github.com:YOUR_USERNAME/YOUR_PROJECT.git
			git remote add gitlab git@gitlab.com:YOUR_USERNAME/YOUR_PROJECT.git
			git remote add bitbucket git@bitbucket.org:YOUR_USERNAME/your_project.git
			</pre>

			==== Pull from all remote repos ====
			* For bash
			<pre>
			gitpullall()
			{
			repos_to_ignore="origin"
			should_ignore=-1

			echo "running: git pull"
			git pull
			echo ""

			for remote in `git remote`
			do
			echo "=================================="
			echo "Remote: $remote"
			echo "----------------------------------"
			for ignore in $repos_to_ignore
			do
			[ "$remote" == "$ignore" ] && { should_ignore=1; break; } \|\| :
			done

			if [ "$should_ignore" == "-1" ]
			then
			THIS_BRANCH_NAME=`git rev-parse --abbrev-ref HEAD`
			git branch -r \| grep -s "^[[:space:]]\+$remote/$THIS_BRANCH_NAME$" 2>&1 > /dev/null \|\| git branch -r \| grep -s "^[[:space:]]\+$remote/$THIS_BRANCH_NAME""[[:space:]]\+" 2>&1 > /dev/null \|\| {
			echo "No info of the remote repo named '$remote' is found."
			echo "So $remote will be fetched."
			echo "running: git fetch $remote"
			git fetch "$remote"
			echo ""
			}
			if git branch -r \| grep -sw "$remote/$THIS_BRANCH_NAME" 2>&1 > /dev/null ; then
			echo "running: git pull $remote $THIS_BRANCH_NAME"
			git pull "$remote" "$THIS_BRANCH_NAME"
			else
			echo "$THIS_BRANCH_NAME branch does not exist on the remote called '$remote'."
			echo "So $remote will not be pulled from $remote."
			fi
			else
			echo "$remote is on the ignored list so ignore it."
			echo "Ignored: $remote"
			fi
			should_ignore=-1
			echo "=================================="
			echo ""
			done
			}
			</pre>
			* For ZSH
			<pre>
			gitpullall()
			{
			repos_to_ignore="origin"
			should_ignore=-1

			echo "running: git pull"
			git pull
			echo ""

			for remote in `git remote`
			do
			echo "=================================="
			echo "Remote: $remote"
			echo "----------------------------------"
			for ignore in $repos_to_ignore
			do
			[ "$remote" = "$ignore" ] && { should_ignore=1; break; } \|\| :
			done

			if [ "$should_ignore" = "-1" ]
			then
			THIS_BRANCH_NAME=`git rev-parse --abbrev-ref HEAD`
			{ git branch -r \| grep -s "^[[:space:]]\+$remote/$THIS_BRANCH_NAME$" 2>&1 > /dev/null } \|\| { git branch -r \| grep -s "^[[:space:]]\+$remote/$THIS_BRANCH_NAME""[[:space:]]\+" 2>&1 > /dev/null } \|\| {
			echo "No info of the remote repo named '$remote' is found."
			echo "So $remote will be fetched."
			echo "running: git fetch $remote"
			git fetch "$remote"
			echo ""
			}
			if git branch -r \| grep -sw "$remote/$THIS_BRANCH_NAME" 2>&1 > /dev/null ; then
			echo "running: git pull $remote $THIS_BRANCH_NAME"
			git pull "$remote" "$THIS_BRANCH_NAME"
			else
			echo "$THIS_BRANCH_NAME branch does not exist on the remote called '$remote'."
			echo "So $remote will not be pulled from $remote."
			fi
			else
			echo "$remote is on the ignored list so ignore it."
			echo "Ignored: $remote"
			fi
			should_ignore=-1
			echo "=================================="
			echo ""
			done
			}
			</pre>

			=== Checkout ===
			==== Checkout to a branch for git repo having multiple remote repos. ====
			<pre>
			git checkout -b existing-branch origin/existing-branch
			</pre>

	= Migration from SVN to Git =		= Migration from SVN to Git =

Kevin: /* Branch */

2015-03-07T03:16:41Z

Branch

← Older revision		Revision as of 03:16, 7 March 2015
Line 370:		Line 370:

	== Branch ==		== Branch ==
			=== Create Branch ===
	* Create branch		* Create branch
	<pre>		<pre>
Line 394:		Line 395:
	</pre>		</pre>

			=== Change Branch ===
	* Change branch		* Change branch
	<pre>		<pre>
Line 399:		Line 401:
	</pre>		</pre>

	- It does not work when the local git repo has multiple remote repositories. If it's the case,		* It does not work when the local git repo has multiple remote repositories. If it's the case,
	<pre>		<pre>
	$ git checkout -b branch remote/branch		$ git checkout -b branch remote/branch
Line 410:		Line 412:


			=== Pull Without Checkout ===
	* To pull a specific branch without checking out		* To pull a specific branch without checking out
	<pre>		<pre>

Kevin: /* Branch */

2015-03-07T03:14:27Z

Branch

@@ Line 393: / Line 393: @@
 $ git push origin branch_name
 </pre>
 * To pull a specific branch without checking out

Kevin: /* Branch */

2015-01-06T12:30:37Z

Branch

← Older revision		Revision as of 12:30, 6 January 2015
Line 394:		Line 394:
	</pre>		</pre>

			* To pull a specific branch without checking out
			<pre>
			$ git fetch <remote> <remoteBranch>:<localBranch>
			</pre>
			e.g.)
			<pre>
			git fetch origin master:master
			</pre>
			<pre>
			git fetch origin adding-new-feature:adding-new-feature
			</pre>

	== Tag ==		== Tag ==

Kevin at 05:56, 27 December 2014

2014-12-27T05:56:21Z

← Older revision		Revision as of 05:56, 27 December 2014
Line 5:		Line 5:
	In the client,		In the client,
	$ apt-get install git-core		$ apt-get install git-core

			Or to install the latest version of Git on Ubuntu
			add-apt-repository ppa:git-core/ppa
			apt-get update
			apt-get install git-core

	== Configuration ==		== Configuration ==

Kevin: /* Commit */

2013-10-02T08:55:31Z

Commit

← Older revision		Revision as of 08:55, 2 October 2013
Line 277:		Line 277:

	== Commit ==		== Commit ==
	* Add file		* Add a file
	$ git add fileName		$ git add fileName

	* Commit		* Commit changes
	$ git commit -m "comment"		$ git commit -m "comment"

Line 292:		Line 292:
	* Amend the last comment		* Amend the last comment
	$ git commit --amend -m "New comment"		$ git commit --amend -m "New comment"


	== Push ==		== Push ==

Kevin: /* Usage */

2013-09-13T14:18:55Z

Usage

← Older revision		Revision as of 14:18, 13 September 2013
Line 389:		Line 389:
	$ git push origin branch_name		$ git push origin branch_name
	</pre>		</pre>


	== Tag ==		== Tag ==
Line 395:		Line 396:
	$ git tag		$ git tag
	</pre>		</pre>


	=== View Tag ===		=== View Tag ===
Line 402:		Line 402:
	$ git show tag_name		$ git show tag_name
	</pre>		</pre>


	=== Create Tag ===		=== Create Tag ===
Line 421:		Line 420:
	$ git log --pretty=oneline		$ git log --pretty=oneline
	</pre>		</pre>


	=== Remove Tag ===		=== Remove Tag ===
Line 427:		Line 425:
	$ git tag -d tag_name		$ git tag -d tag_name
	</pre>		</pre>


	== Merge Multiple Git Repositories into One ==		== Merge Multiple Git Repositories into One ==

Kevin: /* Tag */

2013-09-13T14:17:56Z

Tag

← Older revision		Revision as of 14:17, 13 September 2013
Line 395:		Line 395:
	$ git tag		$ git tag
	</pre>		</pre>


			=== View Tag ===
			* To view tag data with commit details.
			<pre>
			$ git show tag_name
			</pre>


	=== Create Tag ===		=== Create Tag ===
Line 413:		Line 421:
	$ git log --pretty=oneline		$ git log --pretty=oneline
	</pre>		</pre>


	=== Remove Tag ===		=== Remove Tag ===
Line 418:		Line 427:
	$ git tag -d tag_name		$ git tag -d tag_name
	</pre>		</pre>



	== Merge Multiple Git Repositories into One ==		== Merge Multiple Git Repositories into One ==

Kevin at 14:14, 13 September 2013

2013-09-13T14:14:41Z

← Older revision		Revision as of 14:14, 13 September 2013
Line 389:		Line 389:
	$ git push origin branch_name		$ git push origin branch_name
	</pre>		</pre>

			== Tag ==
			=== List Tags ===
			<pre>
			$ git tag
			</pre>

			=== Create Tag ===
			* Create Tag
			<pre>
			$ git tag -a tag_name -m 'tag message: new version blah blah'
			</pre>
			* Tag later
			<pre>
			$ git tag -a tag_name -m 'tag message' commit_checksum
			</pre>
			e.g.)
			<pre>
			$ git tag -a v1.5 -m 'new version with blah blah' b015e9d
			</pre>
			* To see the list of checksum use the following command.
			<pre>
			$ git log --pretty=oneline
			</pre>

			=== Remove Tag ===
			<pre>
			$ git tag -d tag_name
			</pre>

Kevin at 10:33, 12 September 2013

2013-09-12T10:33:26Z

← Older revision		Revision as of 10:33, 12 September 2013
Line 363:		Line 363:
	* Reference		* Reference
	[http://stackoverflow.com/questions/953481/restore-a-deleted-file-in-a-git-repo?answertab=votes#tab-top http://stackoverflow.com/questions/953481/restore-a-deleted-file-in-a-git-repo?answertab=votes#tab-top]		[http://stackoverflow.com/questions/953481/restore-a-deleted-file-in-a-git-repo?answertab=votes#tab-top http://stackoverflow.com/questions/953481/restore-a-deleted-file-in-a-git-repo?answertab=votes#tab-top]


			== Branch ==
			* Create branch
			<pre>
			$ git branch branch_name
			</pre>
			* Change to the branch just created
			<pre>
			$ git checkout branch_name
			</pre>
			OR
			* Create and change
			<pre>
			git checkout -b branch_name
			</pre>

			* Back to master
			<pre>
			$ git checkout master
			</pre>

			* To push,
			<pre>
			$ git push origin branch_name
			</pre>