Git Basics « »

git config --system
# Stored in /etc/config or c:\Program Files(x86)\Git\etc\gitconfig

git config --global
# Stored in ~/.gitconfig or c:\Users\<NAME>\.gitconfig

git config
# Stored in .git/config in each repo

git config --global --list
git config --global user.name "Pere Pages"
git config --global user.email "[email protected]"
git config --unset core.autocrlf

git init

# only modified
 git add -u
 
 # modified and new
 git add --all
 git add -A
 
 git commit -m "files changed"
 
 git log
 
 # comparing with the last cmomit
 git diff dd68210..a234c4 
 
 # The lataest commit is called HEAD
 git diff HEAD
 # the prior the latest one
 git diff HEAD~1 
 # before the prior of the latest one
 git diff HEAD~2

 # Undoing one file
 git checkout README.txt
 
 # Undoing all changes in the files but not removing the staged or discarding
 git chekcout .
 
 # All changes back to the HEAD (the last commit) losing the staged and therefore discarding
 git reset --hard 
 
 # Goes back to one commit before the last one (HEAD) but keeps the staged files
 git reset soft HEAD~1

# what are we going to discard?
git clean -n 

# discard changes
git clean -f

# discard all changes to the last commit (HEAD)
git reset --hard

node_modules
logs
*.tmp

git remote add origin https://github.com/user/repo.git
# Set a new remote

git remote -v
# Verify new remote

git clone https://github.com/pearpages/guess-the-number

# See the log in one line
git log --oneline

# Count lines
git log | wc -l

git log --oneline --graph

git shortlog -sne

git show HEAD
git show HEAD~1

git log --oneline
git show 5642626

git remote
git remote -v

git branch

# display remote branches
git branch -r

git tag

git remote -v
git remote add origin https://github.com/pearpages/ionic-ticketing-tool.git
git fetch
# If there's more than one remote repository
get fetch origin

# checking the log of the remote master
git log origin/master

git merge origin/master

git fetch
git merge origin/master

git pull origin master

git push origin master

git tag v1.0

# signed tag
git tag -s v2.0 

# check signature of tag
git tag -v v2.0

git push --tags

git log --graph --oneline --all --decorate

# We can create alias in git
git config --global alias.lga "log --graph --oneline --all --decorate"

git branch feature1
git checkout feature1

# create branch keeping not staged files
git branch -b feature1

# renaming is the same than moving
# renaming LOCAL branch
git branch -m <oldname> <newname>
git branch -m fix1 bug1234

# deleting the branch
git branch -d bug1234

git reflog
git branch bug1234 5a78c8b

git stash
git stash list
git stash apply
# it's the same than apply but gets rid of it in the list
git stash pop

git stash drop
git stash branch feature2

git merge feature1
git branch -d feature1

git merge feature2_additional
git diff --cached
git commit -m "merged"

git rebase master

git cherry-pick 6fa4324

git push origin :my-branch-to-delete

# Show what will be deleted with the -n option:

git clean -f -n
# Then - beware: this will delete files - run:

git clean -f
# If you want to also remove directories, run git clean -f -d or git clean -fd

# If you just want to remove ignored files, run git clean -f -X or git clean -fX

# If you want to remove ignored as well as non-ignored files, run git clean -f -x or git clean -fx

# Note the case difference on the X for the two latter commands.

# You can do it without the -- , but if the filename looks like a branch or tag (or other revision identifier), it may get confused, so using -- is best.
git checkout v1.2.3 -- my-file.js         # tag v1.2.3
git checkout stable -- my-file.js         # stable branch
git checkout origin/master -- my-file.js  # upstream master
git checkout HEAD -- my-file.js           # the version from the most recent commit
git checkout HEAD^ -- my-file.js          # the version before the most recent commit

git update-index --assume-unchanged <file>

# update
# To undo and start tracking again (if you forgot what files were untracked, see this question):

git update-index --no-assume-unchanged [<file> ...]

git merge -X theirs <branch>

git merge -s ours <branch>

git commit -am "message of the commit" --date="2015-11-28 11:34:12"