{"type":"doc","content":[{"type":"paragraph","content":[{"text":"Git commands can be repetitive and often times we only need 10% of the commands to be able to conduct most of the work. You can use the following “git shortcuts” to increase your productivity.","type":"text"}]},{"type":"codeBlock","content":[{"text":"# Add\nalias ga='echo git add;git add'\nalias gap='echo git add -p;git add -p'\nalias gaa='echo git add -A;git add -A'\nalias gau='echo git add -u;git add -u'\n# Seleche 'modified' files and adds them to git\nalias gam='git status && git add -u && git status'\n\n# Bisect\nalias gbig='echo git bisect good;git bisect good'\nalias gbib='echo git bisect bad;git bisect bad'\nalias gbir='echo git bisect reset;git bisect reset'\n\n# Branch\nalias gb='echo git branch;git branch'\nalias gbm='echo git branch -m (renaming current branch);git branch -m'\n\n# Checkout\nalias gco='echo git checkout;git checkout'\nalias gcom='echo git checkout master;git checkout master'\n\n# Cherry Pick\nalias gcp='echo git cherry-pick;git cherry-pick'\nalias gcpa='echo git cherry-pick --abort;git cherry-pick --abort'\nalias gcpc='echo git cherry-pick --continue;git cherry-pick --continue'\n\n# Clean\nalias gc='echo git clean;git clean'\nalias gcf='echo git clean -fdx;git clean -fdx'\nalias gcff='echo git clean -ffdx;git clean -ffdx'\n\n# Commit\nalias gca='echo git commit --amend;git commit --amend'\nalias gcan='echo git commit --amend --no-edit;git commit --amend --no-edit'\n\n# Diff\nalias gd='echo git diff;git diff'\nalias gdh='echo git diff HEAD;git diff HEAD'\nalias gdc='echo git diff --cached;git diff --cached'\n\n# Fetch\nalias gf='echo git fetch;git fetch'\nalias gfp='echo git fetch --prune;git fetch --prune'\n\n# Grep\nalias gg='echo git grep;git grep'\nalias ggr='echo git grep --recurse-submodules;git grep --recurse-submodules'\n\n# Log\nalias gl='echo git log;git log'\n\n# Pull\nalias gpl='echo git pull --rebase; git pull --rebase;'\nalias gplo='echo git pull origin;git pull origin'\nalias gplom='echo git pull origin master;git pull origin master'\nalias gploh='echo git pull origin head;git pull origin head'\n\n# Push\nalias gpsonv='echo git push origin --no-verify; git push origin --no-verify'\nalias gpsofnv='echo git push origin -f --no-verify; git push origin -f --no-verify'\nalias gpso='echo git push origin;git push origin'\nalias gpsof='echo git push origin -f;git push origin -f'\nalias gpsoh='echo git push origin head;git push origin head'\nalias gpsohf='echo git push origin head -f;git push origin head -f'\n\n# Reset\nalias grh='echo git reset --hard;git reset --hard'\nalias grhh='echo git reset --hard HEAD; git reset --hard HEAD'\n\n# Rebase\nalias gr='echo git rebase;git rebase'\nalias gri='echo git rebase -i;git rebase -i'\nalias grm='echo git rebase master;git rebase master'\nalias grc='echo git rebase --continue;git rebase --continue'\nalias gra='echo git rebase --abort;git rebase --abort'\n\n# Reflog\nalias grefl='echo git reflog;git reflog'\n\n# Show\nalias gsh='echo git show HEAD;git show HEAD'\n\n# Stash\nalias gst='echo git stash;git stash'\nalias gstpo='echo git stash pop;git stash pop'\nalias gstps='echo git stash push;git stash push'\nalias gsts='echo git stash show;git stash show'\nalias gstl=' echo git stash list;git stash list'\nalias gstc='echo git stash clear;git stash clear'\nalias gstsap='echo git stash save -p;git stash save -p'\n\n# Status\nalias gs='echo git status;git status'\n\n# Submodules\nalias gsu='echo_and_run git submodule update'\nalias gsui='echo_and_run git submodule update --init'\nalias gsuir='echo_and_run git submodule update --init --recursive'\nalias gsrh='echo_and_run git submodule foreach git reset --hard --recurse-submodules'\nalias gscf='echo_and_run git submodule foreach --recursive git clean -fdx'\nalias gscff='echo_and_run git submodule foreach --recursive git clean -ffdx'\n\n# Update a PR by adding modified files, commit, squash, and then push to git with force flag\nalias gupr=\"echo 'git [add modified]';echo 'git commit --amend --noedit';echo 'git push origin head -f';gam;git commit --amend --no-edit;git push origin head -f;git status\"\n\n# Create and checkout a new branch for an issue\ngcob() {\n if [[ $# -ne 2 ]]; then\n # display usage\n echo \"Usage: gcob \\\"\\\"\"\n else\n echo \"git checkout -b user/$SIBROS_EMAIL_USERNAME/$1-$2\"\n git checkout -b user/$SIBROS_EMAIL_USERNAME/$1-$2\n fi\n}\n\n#Create and checkout a new branch for an epic or feature\nalias gcobe='gcobf'\ngcobf() {\n if [[ $# -ne 2 ]]; then\n # display usage\n echo \"Usage: gcobf \\\"\\\"\"\n else\n echo \"git checkout -b feature/$1-$2\"\n git checkout -b feature/$1-$2\n fi\n}\n\n# Checkout a branch by issue number (regardless if its under your user or not)\n# This will checkout the first branch it finds that has user/.*/. It first searches local branches, then remote branches.\n# If there is no local branch, but there is a remote branch, it will setup a remote tracking branch and check it out\ngcoi() {\n if [[ $# -ne 1 ]]; then\n # display usage\n echo \"Usage: gcoi \"\n else\n git fetch\n # tries to find in local branch list\n local branch_name=$(git branch | awk -F ' +' '! /\$no branch\$/ {print $2}' | grep -E -e \"user/.*/#?$1\" | head -n1)\n if [ -z \"$branch_name\" ]; then # if can't find local branch, search remotes\n branch_name=$(git branch -r | awk -F ' +' '! /\$no branch\$/ {print $2}' | grep -E -e \"user/.*/#?$1\" | head -n1 | awk '{split($0,branch_name,\"origin/\");print(branch_name[2])}')\n fi\n\n if [ -z \"$branch_name\" ]; then\n echo -e \"\\033[0;31mBranch with issue #$1 does not exist on local nor remote!\"\n else\n echo \"Checking out $branch_name...\"\n git checkout $branch_name\n fi\n fi\n}\n\n# Checkout a release branch by issue/epic number\n# This will checkout the first branch it finds that has feature/. It first searches local branches, then remote branches.\n# If there is no local branch, but there is a remote branch, it will setup a remote tracking branch and check it out\nalias gcoie='gcoif'\ngcoif() {\n if [[ $# -ne 1 ]]; then\n # display usage\n echo \"Usage: gcoif \"\n else\n git fetch\n # tries to find in local branch list\n local branch_name=$(git branch | awk -F ' +' '! /\$no branch\$/ {print $2}' | grep -E -e \"feature/[&#]?$1\" | head -n1)\n if [ -z \"$branch_name\" ]; then # if can't find local branch, search remotes\n branch_name=$(git branch -r | awk -F ' +' '! /\$no branch\$/ {print $2}' | grep -E -e \"feature/[&#]?$1\" | head -n1 | awk '{split($0,branch_name,\"origin/\");print(branch_name[2])}')\n fi\n\n if [ -z \"$branch_name\" ]; then\n echo -e \"\\033[0;31mBranch for issue &$1 does not exist on local nor remote!\"\n else\n echo \"Checking out $branch_name...\"\n git checkout $branch_name\n fi\n fi\n}\n\nunalias gcm 2>/dev/null\n\n# Commits and automatically prepends \"closes #: \"\ngcm() {\n if [[ $# -ne 1 ]]; then\n # display usage\n echo \"Usage: gcm \\\"Commit Msg\\\"\"\n echo \"Automatically Prepends \\\"closes #: \\\"\"\n else\n # Todo: #2607 - remove support for parsing old branch name conventions\n local issue_number=$(git rev-parse --abbrev-ref HEAD | cut -d/ -f3 | awk '{split($0, issue_num,\"-\");print(issue_num[1]);}' | tr -d '#&')\n\n if [ -z \"$issue_number\" ]; then\n echo -e \"\\033[0;31mCould not extract issue number from branch name!\"\n else\n echo \"git commit -m \\\"closes #$issue_number: $1\\\"\"\n git commit -m \"closes #$issue_number: $1\"\n fi\n fi\n}\n\n# Performs the starting sequence of a git bisect 'git bisect start; git bisect bad; git bisect good \ngbi() {\n git bisect start\n git bisect bad\n git bisect good $1\n}\n\nunalias gcb 2>/dev/null\n\n# Purge local/remote branches that are already merged into master\n# gcb stands for \"git clean branches\". This is not an actual git command, but it describes what this command does\ngcb() {\n echo \"Cleaning merged branches\"\n git fetch\n gcom\n gpl\n echo -e \"\\033[0;31m\"\n\n # From: https://github.com/not-an-aardvark/git-delete-squashed\n # Deletes branches that were squashed before merged\n git for-each-ref refs/heads/ \"--format=%(refname:short)\" | while read branch; do mergeBase=$(git merge-base master $branch) && [[ $(git cherry master $(git commit-tree $(git rev-parse $branch^{tree}) -p $mergeBase -m _)) == \"-\"* ]] && git branch -D $branch; done\n\n git remote prune origin # delete deleted remotes\n git branch --merged origin/master | grep -v \"\\* master\" | xargs -n 1 git branch -d # delete merged locals that didn't squash commits\n echo -e \"\\033[0m\"\n gco -\n}\n\n#select a specific stash to apply to working branch\ngstpos () {\n if [[ $# -ne 1 ]]; then\n # display usage conditions\n echo \"Usage: pop specific stash number (must exist in stash list)\"\n else\n echo \"Applying stash@{$1} contents\"\n git stash pop stash@{$1}\n fi\n}\n\n","type":"text"}]}],"version":1}

Browser not supported