git.md

Git

Git is a distributed version control system (VCS) that allows developers to track changes in source code, collaborate on software development, and manage projects of any size efficiently. Created by Linus Torvalds in 2005. A good source of truth is the documentation on Git-SCM.

For changing the output to be Terminal instead of pager:

As of Git 2.16, the default behavior changed. It uses LESS to display the output. In order to change that and print out the output in Terminal, need to disable pager:

git config --global pager.branch false

But that only disables it for git branch. If the goal is to disable it for every command, can simply add the following to shell:

export LESS="$LESS -F -R -X"

• F (or --quit-if-one-screen): Exits immediately if the output fits on one screen instead of waiting for user input.
• R (or --raw-control-chars): Output "raw" control characters. The -R option in less is used to interpret raw control characters for ANSI colors. When -R is enabled, less preserves and displays ANSI colors instead of showing raw escape sequences.
• X: Disables clearing the screen when less exits, so the content remains visible.

For a list of files to be pushed, run:

git diff --stat --cached [remote/branch]
# example: git diff --stat --cached origin/master

For the code diff of the files to be pushed, run:

git diff [remote repo/branch]

To see full file paths of the files that will change, run:

git diff --numstat [remote repo/branch]

To stop tracking a file you need to remove it from the index:

git rm --cached <file>
git rm -r --cached .

To see list of commits without push:

git log origin/master..master

To remove a git commit which has not been pushed:

Warning

this will revert local changes.

git reset --hard COMMIT-ID
# example: git reset --hard eb27bf26dd18c5a34e0e82b929e0d74cfcaab316

To clone a repo (with a branch):

git clone URL
git add .
git commit -m “message”
git push

To undo ‘git add’ before commit:

git reset <file>
git reset

To discard all local uncommitted changes:

git checkout .

To discard all unstaged files in current working directory use:

git checkout -- .

To remove untracked files:

# Remove all untracked files and directories.
# '-f' is force, '-d' is remove directories.
git clean -fd
# preview changes
git clean -nd

To compare local repo with remote repo:

git diff master

To list branches:

git branch -a

To rename a branch:

git branch -m <old name> <new name>

To switch to another branch:

git checkout branch-a

To merge other branches with the master branch:

git merge branch-a

To create and switch to a new branch:

git checkout -b new-branch-name

To undo a pushed commit without any trace:

git reset <previous label or sha1>
git commit -am "Some commit message"
git push -f <remote-name> <branch-name>

To merge/squash the last three commits into one:

git reset --soft HEAD~3 # [~ is called tilde]
git commit -m "New message for the combined commit"

To start a new feature branch:

git flow feature start ch<story number>/<branch name>

Now, start committing on your feature. When done, use:

git flow feature finish ch8376/get-directions

To rebase the current branch with develop branch:

git rebase -i origin/develop
:wq
git push -f

To add new changes to a not pushed commit:

git add .
git commit --amend --no-edit

To see the difference of the last commit:

git diff HEAD^

To sign all the commits automatically:

add the following to `.gitconfig`:
  [commit]
    gpgsign = true

Fetch and checkout a remote branch:

git fetch
git checkout -b <branch> origin/<branch>

Change the base of the branch:

git rebase --onto new-base-branch current-base-branch

Compare local branch with the same branch on remote:

git fetch
git diff @{upstream}

Cherry picking:

git cherry-pick <commit-hash>

List remote branches:

git branch -r

See only files that are having conflicts:

git diff --name-only --diff-filter=U

To Delete every branch that starts with bugfix:

git branch --list ‘bugfix*’ | xargs -r git branch -d

To stash changes with a name:

git stash push -m “some name”

To change remote upstream:

git remote rename origin upstream
git remote add origin git@github.com:[new repo]
git config --get remote.origin.url // prints out the new remote upstream

To unset upstream after renaming a branch that has been pushed to the remote:

git branch --unset-upstream

Copy diff into clipboard:

git diff | pbcopy

Apply the diff inside the clipboard:

pbpaste | git apply