Home Original page

GitHub - craigmaas/practice-git: A practice git repository where you can eff up as much as you'd like plus work with a real, living, breathing person on the other side. Here we learn all things git. Feel free to send Pull Requests to see what it's like when someone asks you "Can you squash your commits for us" and you're all like "How the hell do I do that?"

:octocat: Git Your Practice On!

Welcome to my practice git repository where you can eff up as much as you'd like plus work with a real, living, breathing person on the other side. Here we learn all things git. Feel free to send me Pull Requests just to discover what it's like when a Repo Master asks you

"Can you squash your commits for us"

and you're all like...

"How the hell do I do that?"

This is where we make those mistakes ... so don't be scared :)

Instructions

Fork this repo and send me a Pull Request with anything from Grandma Peggy's Crumbled Oatmeal Cookie Recipe to your favorite Sublime Text 2 preferences. It's all good yo! Learning is the prize in this game.

Typical & Highly Useful Git Commands

git clone git@github.com:<user_name>/the-repo-you-are-cloning.git

Clones your remote origin repo locally

Pulls in the remote changes not present in your local repo. Downloads objects and references from another repository.

git merge upstream/master

Merges any changes fetched into your working files

Start tracking new files and also stage changes to already tracked files

git status & git diff

  • Tells us what files and assets have been modified and staged

This will display what files have been removed, changed or modified.

  • (M) - modified
  • (A) - added
  • (AM) - file has not been altered since it was last added
git commit -m 'the message goes here for the commit'

Records a snapshot of the project into your history at the time of your commit.

git add '*.<file_extension>'

This command adds all file types with the same extension, especially from different directories. Without quotes the command will only execute within the same directory it's been called from.

Unstages a file from the working tree (i.e. stops tracking the file).

Remembers all the changes we've committed so far, in the order we committed them.

See where new files were added for the first time or where files were deleted.

git remote add origin git@github.com:<user_name>/<repo_name>.git

Creates a brand new remote repository.

Show a list of the current remote repositories

Removes the desired file from staging area.

List all the remote branches currently tracked

Deletes branch locally if it has been removed remotely. Helps to remove stale references.

Changes the desired target back to the state of the last commit. A target can be a file or a directory (for example).

Rebase allows you to easily change a series of commits, reordering, editing, or squashing commits together into a single commit.

Be warned: it's considered bad practice to rebase commits which you have already pushed to a remote repo. Doing so may invoke the wrath of the git gods. https://help.github.com/articles/interactive-rebase

Adding

(i.e. git add readme.md license.txt. Can be multiples)

Add all the new files since last

Add all txt files in directory

Staging

Show unstaged differences since last commit

Gets the staged differences and displays what has changed since our last commit

Reverting

Head is the last commit on the current branch we are on. What if you stage something you didn't need to be staged? This is the key.

Reset all changes to a file since last commit

What if you regret a commit? This will undo your last commit. (^ means move commit before HEAD and puts changes into staging).

Traverse through commits and revert back one by one.

Undo Last commit and all changes

git commit --amend -m "added another file to the commit'

New commit message will override previous commit message

Remotes

"Remotes are kinda like bookmarks"

Show the current remote repos

git remote add <name> <address>

Add a new remote repo

Remove remote repo

Cloning, Branching, Fetching & Merging

Pulls down any changes but doesn't merge them

Makes a new branch

git checkout <branch name>

Switching branch and on a different timeline

Merges branch into master

git branch -d <branch name>

Deletes branch

git checkout -b <branch name>

Creates a new branch and then switches to it

VI Editor Quick Key Exit

g fetch origin

git checkout -t <remote>/<branch>

Fetches a remote branch not available locally also reference issue #7

Pushing & Pulling

git push -u origin master (remote repo name[origin], local branch name[master])

Lets you just run git push later on without specifying name and branch

Pull changes in and syncs up your repo. Doesn't update local code

Branching

List all remote branches

Show all the remote branches

git push origin :<branch name>

Deletes the remote branch

git branch -D <branch name>

Delete the local repo branch and if you don't want the commits any longer on it then delete them too.

Deletes the branch locally if it has been removed remotely. Helps to remove stale references.

Rebasing

"Merge commits are bad"

Move all changes to master local which are not in origin/master remote to a temporary area

History

Viewing the commits history

git config --global color.ui true

Color codes the commit SHA

or

git log --graph --oneline --all

Commit and history is one line

git log --pretty=format:"%h

Exactly how you want the output using placeholders (use git help log)

Date Ranges. For example you could grab everything from the year 2013 using git log --until 2013

Removal

Removes file completely

git rm --cached <file names>

Won't be deleted from your file system, but keeps the local changes still.

Help

Nasty link