Skip to content

Latest commit

 

History

History
144 lines (117 loc) · 2.87 KB

git-basics.md

File metadata and controls

144 lines (117 loc) · 2.87 KB

Nice resource: https://github.com/k88hudson/git-flight-rules

To stage new, modified or deleted files:

git add -A

To stage new and modified files:

git add .

To stage modified and deleted files:

git add -u

To stage new and modified files:

git add *

Deletes the file from your working directory and stages the deletion.

git rm [file]

Git commit

git commit -m "your text"

Edit a commit message

git commit --amend -m "New message"

Adds your staged changes to the last commit you pushed without adding an additional commit message.

git commit --amend

Add and commit - Not recommended for beginners.

git commit -am "message"

Throw away all you uncommitted changes

git reset --hard

Unstages the file, but it preserves the file contents.

git reset [file]

Undoes all the commits after the specified commit and preserves the changes locally.

git reset [commit-id]

Remove a file from git without removing it from computer Sometime using “git add” command you might end up adding files that you didn’t want to add. If you are not careful during a “git add”, you may end up adding files that you didn’t want to commit. You should remove the staged version of the file, and then add the file to .gitignore to avoid making the same mistake a second time:

git reset file_name
echo filename >> .gitignore

git config

git config -global user.name "[name]"
git config -global user.email "[email address]"

Retrieves changes and additions from a remote repository, however doesn’t change any of your local branches.

git fetch

pulls changes from a remote repository into your current branch. Basically doing a git fetch followed by a git merge.

git pull 

This command shows the differences between the files in the staging area and the latest version present.

git diff –staged

Switch from one branch to another.

git checkout [branch name]

Creates a new branch and also switches to it.

git checkout -b [branch name]

Temporarily stores all the modified tracked files.

git stash save

Restores the most recently stashed files.

git stash pop

Lists all stashed changesets.

git stash list

Discards the most recently stashed changeset.

git stash drop

Get remote URL, get the URL of the repo

git config --get remote.origin.url
OR
git remote show origin

Delete all the commit history in the github

git checkout --orphan newBranch
git add -A  # Add all files and commit them
git commit
git branch -D master  # Deletes the master branch
git branch -m master  # Rename the current branch to master
git push -f origin master  # Force push master branch to github
git gc --aggressive --prune=all     # remove the old files

You can view all of your settings and where they are coming from using:

git config --list --show-origin