Showing posts with label GIT. Show all posts
Showing posts with label GIT. Show all posts

Wednesday, May 11, 2016

GIT create new branch

If you like the method in the link you've posted, have a look at Git Flow.

It's a set of scripts he created for that workflow.

But to answer your question:
$ git checkout -b myFeature dev
Creates MyFeature branch off dev. Do your work and then
$ git commit -am "Your message"
Now merge your changes to dev without a fast-forward
$ git checkout dev
$ git merge --no-ff myFeature

Now push changes to the server
$ git push origin dev
$ git push origin myFeature
Refs http://stackoverflow.com/questions/4470523/git-create-a-branch-from-another-branch

Wednesday, May 7, 2014

Basic GIT commands

clone a new project from a repository on Server
$ git clone //server_path

Show the information on repository in local
$ git remote show origin

Show the branch information
$ git branch

Show list of the configuration
$ git config -l

Switch to a branch
$ git checkout <branch_name>

Push to another branch on Server
$ git push origin local_branch:server_branch

Update latest commit
$ git pull

Edit latest comment
$ git commit --amend -m "New commit message"

Show all version
$ git log

Show current version
$ git show

Delete latest commit
$ git reset --soft 'HEAD^'

Revert latest commit
$ git reset --hard HEAD

Fix error "The following untracked working tree files would be overwritten by merge"
Use -n or --dry-run to preview the damage you'll do.
$ git clean -n
$ git clear -n <file_path> To create a "feature branch" from the dev branch $ git checkout -b myfeature dev Delete a branch $ git branch -d myfeature

Monday, October 7, 2013

Install RabbitVCS on Ubuntu 12.10

First install some prerequisites.

$ sudo apt-get update

$ sudo apt-get install python-nautilus python-configobj python-gtk2 python-glade2 python-svn python-dbus python-dulwich subversion meld gconf-editor


Download the tarball, untar it and run the setup script

$ wget http://rabbitvcs.googlecode.com/files/rabbitvcs-0.15.2.tar.bz2

$ tar jxvf rabbitvcs-0.15.2.tar.bz2

$ cd rabbitvcs-0.15.2/

$ sudo python setup.py install --install-layout=deb


Still inside the rabbitvcs-0.15.2 directory, cd to the nautilus-3.0 under the clients directory and copy the RabbitVCS.py to the extensions dir

$ cd clients/nautilus-3.0

$ sudo cp RabbitVCS.py /usr/share/nautilus-python/extensions/


Logout and log back in. Now create a folder and right click on it to see the RabbitVCS menu, perform a checkout.

Refs: http://linuxdrops.com/install-rabbitvcs-svn-git-client-on-ubuntu-12-1012-0411-1011-04/