Coder Social home page Coder Social logo

learn-git-asap's Introduction

Learn GIT in 3 STEPS!

##########

STEP I - my Web site review: [LIVE DEMO] (https://ddeveloperr.github.io/GIT_SUPER_RFERENCE_site/)

############################################################################# ###########

STEP II - ### Visual review, retype, repeat, AND REMEMBER WORKFLOW

#############################################################################

Do it for min 3 times or more:

Try git Here

tryGit

Complete the gitimmersion.com

gitimmersion.com

Check out the best [visual git command review] (http://ndpsoftware.com/git-cheatsheet.html#loc=workspace;)

git-cheatsheet ############# ###########

STEP III - Basic, Braches, Viewing info

############################################################################# #############

BASICS

#############

To make changes:

git add path/to/file1 path/to/file2
git commit -m "templates: Changed the XX template to do XYZ"

To push that to the central server (which makes it available for deployment):

git push

To revert a file to its state in the repository:

git checkout path/to/file_that_has_changed

To get the latest code changes:

git pull --rebase

#############################

REMOTE BRANCHES: YOUR OWN

#############################

We use remote tracking branches for branching.

To create a tracking branch called "ajax_fallback":

git checkout -b ajax_fallback
git push -u origin ajax_fallback

To push changes in this branch:

git push

If you get an error, pull the latest files, then try again:

	git pull
	git push

If, after that, you still get an error for "git push", pull on master, then
go back to the branch and try again:

	git checkout master
	git pull --rebase

	# Try again.
	git checkout ajax_fallback
	git push

If, after that, you still get an error and the error message contains
"[rejected]", then find the branch name next to "[rejected]" and update it.
Then go back to the branch and try again.

	git checkout branch_that_was_rejected
	git pull

	# Try again.
	git checkout ajax_fallback
	git push

To pull changes that other people have made to this branch (do not use rebase!):

git pull

To pull changes that have been made to master (do not use rebase!):

git merge master
git push

If you get an error for "git push", do a straight "git pull" WITHOUT "--rebase".

	git pull

To see the full diff of what's changed in this branch:

git checkout master
git diff master ajax_fallback

When you're ready to merge the branch back into master:

# Double check the full diff of what changed.
git checkout master
git diff master ajax_fallback

# Merge it (keep in mind you're still in master).
git merge ajax_fallback
git push

# Delete the local and remote branches.
git branch -d ajax_fallback
git push origin :ajax_fallback

To delete a branch without merging it back into master:

git checkout master
git branch -D ajax_fallback
git push origin :ajax_fallback

###################################

REMOTE BRANCHES: OTHER PEOPLE'S

###################################

To check out the branch somebody else has created:

git checkout --track origin/ajax_fallback

To push changes in this branch:

git push

To pull changes that other people have made to this branch (do not use rebase!):

git pull

To pull changes that have been made to master (do not use rebase!):

git merge master
git push

To see the full diff of what's changed in this branch:

git checkout master
git diff master ajax_fallback

##################

LOCAL BRANCHES

##################

Generally all of our branches are remote, but if you want to create a local one, a few things are different -- namely to use "git rebase master" when you pull changes from master.

To create the branch:

git checkout -b ajax_fallback

To pull changes that have been made to master:

git rebase master

################

VIEWING INFO

################

To view which branch you're on:

git status

To view all branches, including remotes:

git branch -a

To view all branches, with information about whether they're tracking/remotes:

git remote show origin

################

learn-git-asap's People

Contributors

ddeveloperr avatar

Stargazers

Roman avatar  avatar Muhamed Krlić avatar

Watchers

James Cloos avatar  avatar

Recommend Projects

  • React photo React

    A declarative, efficient, and flexible JavaScript library for building user interfaces.

  • Vue.js photo Vue.js

    🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.

  • Typescript photo Typescript

    TypeScript is a superset of JavaScript that compiles to clean JavaScript output.

  • TensorFlow photo TensorFlow

    An Open Source Machine Learning Framework for Everyone

  • Django photo Django

    The Web framework for perfectionists with deadlines.

  • D3 photo D3

    Bring data to life with SVG, Canvas and HTML. 📊📈🎉

Recommend Topics

  • javascript

    JavaScript (JS) is a lightweight interpreted programming language with first-class functions.

  • web

    Some thing interesting about web. New door for the world.

  • server

    A server is a program made to process requests and deliver data to clients.

  • Machine learning

    Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.

  • Game

    Some thing interesting about game, make everyone happy.

Recommend Org

  • Facebook photo Facebook

    We are working to build community through open source technology. NB: members must have two-factor auth.

  • Microsoft photo Microsoft

    Open source projects and samples from Microsoft.

  • Google photo Google

    Google ❤️ Open Source for everyone.

  • D3 photo D3

    Data-Driven Documents codes.