Pacific-Design.com

    
Home Index

1. Linux

2. Git

+ Automate

+ Changes

+ GitBucket

+ Git Flow

+ Git Server

+ Git Update

+ Markup

+ Pull Ignore Local

+ Rollback

+ Update All Repos

+ gitignore

+ vimdiff

Linux / Git /

Git Tutorial

http://onlywei.github.io/explain-git-with-d3/

Create a Branch


#----------- Short Hand ----------#
$ git checkout -b new-feature 
Switched to a new branch "iss53"

#-------------- OR ---------------#
$ git branch new-feature 
$ git checkout new-feature

http://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging#Basic-Branching

Fast-Forward Merge


# Start a new feature
git checkout -b new-feature master

# Edit some files
git add 
git commit -m "Start a feature"

# Edit some files
git add 
git commit -m "Finish a feature"

# Merge in the new-feature branch
git checkout master
git merge new-feature
git branch -d new-feature

https://www.atlassian.com/git/tutorials/using-branches/git-merge