Saturday, December 20, 2014

GIT - A Simple Reference


Assume a case where there is Master Branch and Development Branch.

$ git branch
*dev
master

GIT - Work Flow (To create a work flow/branch and work)
-----------------------------------------------------------------------

$ git flow init
$ git flow feature start <id>

After creating the Work flow, moves to feature branch(indicated by *)

$ git branch
   dev
* feature/<ID>
   master

$ git add "modified file names with spaces"
$ git commit -am "Meaningful comment"
$ git flow feature finish <id>


Reset to the head of the current branch
----------------------------------------
$ git reset --hard HEAD

To see the list of check-in's made
------------------------------------
$ git log - prints the list of check-in's made
commit  <SHA ID 1>
Author: name <name@domain.com>
Date:   <Date of commit>

To Delete a WorkFlow/Branch
------------------------------------
$ git branch -D  feature/<ID>

To update the feature branch changes to dev branch
--------------------------------------------------
$ git checkout dev
$ git fetch
$ git rebase -p origin/dev
$ git checkout feature/<id>
$ git rebase -p dev
$ git flow feature finish <id>

To Push the code to Origin/Remote dev
------------------------------------
-$ git push origin dev

No comments:

Post a Comment