Useful GIT commands #git

change_user_after_commit.sh

git commit --amend --author="John Doe <john@doe.org>"

checkout_new_branch.sh

git checkout -b {NEW_branch_name} {SOURCE_branch_name}

checkout_tagged_version.sh

git clone --branch <tag_name> <repo_url> --depth  1

delete_branch.sh

#delete local branch
git branch -d feature/login

#delete remote branch
git push origin --delete feature/login

delete_multiple_branches.sh

git branch -d -f `git branch --list '3.2.*'`

git branch -d -f `git branch --list 'release/*'`

git-commit-log-stats.md

git commit stats

Commands to get commit statistics for a Git repository from the command line - using git log, git shortlog and friends.

---

List repository contributors by author name (sorted by name):

$ git log --format='%aN' | sort -u

Example output:

Jane Bar
John Foo
Steve Baz

---

List total commits by author (sorted by commit count):

$ git shortlog -sn

Example output:

136 Jane Bar
 41 John Foo
 17 Steve Baz

Ignore merge commits:

$ git shortlog -sn --no-merges

Example output:

121 Jane Bar
 36 John Foo
 14 Steve Baz

Even though the --no-merges option is not documented for git shortlog, it works exactly as defined for git log.

---

List file change stats by author:

$ git log --author="Vorname Nachname" --pretty=tformat: --numstat | awk '{inserted+=$1; deleted+=$2; delta+=$1-$2; ratio=deleted/inserted} END {printf "Commit stats:\n- Lines added (total)....  %s\n- Lines deleted (total)..  %s\n- Total lines (delta)....  %s\n- Add./Del. ratio (1:n)..  1 : %s\n", inserted, deleted, delta, ratio }' -

Example output:

Commit stats:
- Lines added (total)....  4625
- Lines deleted (total)..  836
- Total lines (delta)....  3789
- Add./Del. ratio (1:n)..  1 : 0.180757

Include file count:

$ git log --shortstat --author="Vorname Nachname" | grep -E "fil(e|es) changed" | awk '{files+=$1; inserted+=$4; deleted+=$6; delta+=$4-$6; ratio=deleted/inserted} END {printf "Commit stats:\n- Files changed (total)..  %s\n- Lines added (total)....  %s\n- Lines deleted (total)..  %s\n- Total lines (delta)....  %s\n- Add./Del. ratio (1:n)..  1 : %s\n", files, inserted, deleted, delta, ratio }' -

Example output:

Commit stats:
- Files changed (total)..  439
- Lines added (total)....  4625
- Lines deleted (total)..  836
- Total lines (delta)....  3789
- Add./Del. ratio (1:n)..  1 : 0.180757

Ignore merge commits:

Note: Both commands above also count merge commits. But to ignore them, one can simply use the --no-merges option again:

$ git log --author="Vorname Nachname" --pretty=tformat: --numstat --since="1 Jan, 2015" | awk ...
# or
$ git log --shortstat --author="Vorname Nachname" --since="1 Jan, 2015" | grep -E ...

Filter stats by date:

You can filter the output of the above commands, for example, by adding --until or --since or --before:

$ git log --author="Vorname Nachname" --pretty=tformat: --numstat --since="1 Jan, 2015" | awk ...
# or
$ git log --shortstat --author="Vorname Nachname" --since="1 Jan, 2015" | grep -E ...

---

git_commands.sh

# FORCE GIT PULL - OVERRIDE LOCAL CHANGES
git fetch --all
git reset --hard origin/master

git_merge_branch_to_master.sh

git checkout master
git pull origin master
git merge test
git push origin master

pull_a_specific_branch_from_remote.sh

git checkout -b branchname remotes/origin/branchname --

#OR SHORTHAND
git checkout --track origin/branch_name

rebase_feature_branch_from_master.sh

git checkout your-feature-branch
git pull --rebase origin master

remove_dir_tracking.sh

git rm -r --cached path_to_your_folder/

remove_git_history.sh

# Checkout
git checkout --orphan latest_branch

# Add all the files
git add -A

# Commit the changes
git commit -am "commit message"

# Delete the branch
git branch -D master

# Rename the current branch to master
git branch -m master

# Finally, force update your repository
git push -f origin master