[Git]: Commonly used git commands

Basic git commands

add

git add ${file name}

add all modified files

git add .

commit with commit message

git commit -m "${commit message}"

add all modified files & commit

git commit -am "${commit message}"

add remote repository

git remote add ${github remote repo address}

push on a branch

git push origin ${branch name}

create a branch

git checkout -b ${branch name}

move to different branch

git checkout ${branch name}

change name of branch

git branch -M ${new branch name}

display state of working directory

git status

see differences with last commit

git diff

display commits made in the repo

git log

more information on this post

show commit log in a graph

git log --graph

More commands

revert a modified file

git checkout -- ${filename}

change the most recent commit message

git commit --amend

When changing the most recent commit message that's already pushed, use the following

git push --force-with-lease ${repository} ${branch}

${repository} and ${branch} are optional

change old commit message

git rebase -i HEAD~${#commits to go back}

For example, HEAD~2 is the second last commit. It will display a list of the last 2 commit messages; bottom displays the most recent commit

pick 86fbdbe modified post # 2nd MOST RECENT COMMIT
pick f4683d1 modified post # MOST RECENT COMMIT
# ...

Replace pick with reword then save & quit

reword 86fbdbe modified post
pick f4683d1 modified post

It will open up the editor to change the specified commit with "reword". Modify the message then save&quit. Push with the following

git push --force-with-lease ${repository} ${branch}

revert the most recent commit

git revert HEAD
OR
git reset HEAD^

more information on this post

add remote repo as upstream on local repo

git remote add --track master upstream ${github repo remote address}

update master branch to the latest version of upstream

git pull --ff upstream master

combine multiple commits

git rebase -i HEAD~${number of commits}

display git history

git reflog

add the modified file to the most recent commit

git commit -C HEAD --amend

ignore the modified file from the stage

git update-index --assume-unchanged ${file name}

staging area is a step before the commit process.

revert ignoring the modified file from the stage

git update-index --no-assume-unchanged ${file name}

stash the changes in dirty working directory away

git stash

i.e. record the current state of working directory without local modification on current branch

remove a single stashed state and apply it on the current working state

git pop

pick particular commit and merge it from other branch

git cherry-pick ${commit hash number}

remove upstream

git branch --unset-upstream