cheatsheet.md

Git Cheatsheet

You can find most of this on the internet but for the sake of complecity of this session below are the commands that I personally find very useful

To check the status

git status

To add untracked file or files

# To add 1 file
git add 'file-name'

# To add all untracked files
git add .

# To add all files inside a directory

git add 'directory-name'

To remove a tracked file

git rm --cached file3.txt

Commit, Revert, Reset

# to commit

git commit -m "message"

# to uncommit & and get your changes in unstagged area

git reset <commit-id or ref> ( commit id or ref of the changes after which your new commit changes came)


# git reset works with file name as well, if you want to move a file from staged area to unstaged area
git reset <file-name>
      or
git restore --staged <file-name>

# to trash your commmit changes

git revert <commit-id or ref> ( commit id of the changes you want to trash)

# to trash your commit changes of a single file
git restore --source <commit-id where original changes were present> <file-name>

To see changes of a specific commit

git show <commit-id>

To undo an unstaged change

git checkout <file-name> or git restore <file-name>

To apply commit from some other branch to your current branch

git cherry-pick <commit-id of the branch from where your want to pull changes>

To apply a patch

git apply <patch-file-path>

To apply a patch with whitespace changes ( whitespace errors)

git apply --ignore-space-change --ignore-whitespace <patch-file-path>