diff options
Diffstat (limited to 'git/.config')
-rw-r--r-- | git/.config/git/config | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/git/.config/git/config b/git/.config/git/config index e4f4d76..230c1ed 100644 --- a/git/.config/git/config +++ b/git/.config/git/config @@ -69,6 +69,8 @@ main = checkout main grep = grep -Ii diff = diff --word-diff branch = branch -ra + +# shortcuts ai = add --interactive recommit = commit --amend -C HEAD redate = rebase --committer-date-is-author-date @@ -77,28 +79,13 @@ redate = rebase --committer-date-is-author-date lg = log --graph --oneline --decorate --branches --remotes --tags --abbrev-commit ls = log --pretty=format:"%C(green)%h\\ %C(yellow)[%ad]%Cred%d\\ %Creset%s%Cblue\\ [%an]" --decorate --date=relative ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [a:%an,c:%cn]" --decorate --numstat -watch = "!f() { watch -c 'git -c color.ui=always lg | sed \"s/\\[m/\\[00m/\"'; }; f" # undo http://megakemp.com/2016/08/25/git-undo/ undo = "!f() { git reset --soft $(git rev-parse --abbrev-ref HEAD)@{${1-1}}; }; f" pop = git reset HEAD~ -# rename branch -brn = "!f() { git branch -m \"$(git rev-parse --abbrev-ref HEAD)\" $1; git fetch origin; git branch -u origin/$1 $1; git remote set-head origin -a; }; f" - -# squash the last N commits, inclusivly -squash = "!f(){ git reset --soft HEAD~${1} && git commit --edit -m\"$(git log --format=%B --reverse HEAD..HEAD@{1})\"; };f" - -# grep on filename -ff = !git ls-files | grep -i - -# remove submodule -smrm = "!f(){ git rm --cached \"$1\";rm -r \"$1\";git config -f .gitmodules --remove-section \"submodule.$1\";git config -f .git/config --remove-section \"submodule.$1\";git add .gitmodules; }; f" - # stash staged files stashindex = !git stash --keep-index && git stash && git stash apply stash@{1} && git stash show -p | git apply -R && git stash drop stash@{1} # generate git artifacts ignore = "!f() { IFS=\",\"; curl -L -s \"https://www.toptal.com/developers/gitignore/api/$*\" ;}; f" -attributes = "!f() { curl -sL https://gist.githubusercontent.com/tobyvin/70f3671c76016063594ea45edbb97094/raw ;}; f" -license = "!f() { curl -sH 'Accept: application/vnd.github.v3+json' https://api.github.com/licenses/$1 | grep -oP '.*\"body\":\\s*\"\\K.*(?=\\s*\",)' | tr '\\n' '\\0' | xargs -0 printf '%b\\n' | sed \"s/\\[year\\]/$(date +'%Y')/\" | sed \"s/\\[fullname\\]/$(git config --get user.name)/\"; }; f" |