Skip to content

Instantly share code, notes, and snippets.

@forsvunnet

forsvunnet/Git examples

Created June 21, 2013 10:23
Show Gist options
  • Star 1 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save forsvunnet/5830315 to your computer and use it in GitHub Desktop.
Save forsvunnet/5830315 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
Git examples
#Make a new branch:
gco -b new_branch
#do bunch of changes
ga -A
gc -m "Made a bunch of changes"
#checkout master
gco master
#get the latest updates to master
gl
#Go back to new_branch or whatever you called it
gco new_branch
#Check diffs:
gd --stat master | cat -
#Attempt a merge (merges master into new_branch)
g merge master
#lots of merge conflicts:
g mergetool
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment