diff options
| -rw-r--r-- | .config/git/config | 84 |
1 files changed, 30 insertions, 54 deletions
diff --git a/.config/git/config b/.config/git/config index b02a77b..399a3a7 100644 --- a/.config/git/config +++ b/.config/git/config @@ -44,8 +44,10 @@ [alias] a = add - ap = add --patch + aa = add --all ai = add --interactive + ap = add --patch + au = add --update b = branch br = branch @@ -58,33 +60,44 @@ cpa = cherry-pick --abort cpc = cherry-pick --continue - ci = commit - cm = commit -m - cma = commit --all -m + c = commit + cm = commit --message + cma = commit --all --message cmv = commit --verbose cmav = commit --all --verbose - ca = commit --amend amend = commit --amend - caa = commit --all --amend --reuse-message=HEAD + ca = commit --amend + cam = commit --amend --message + can = commit --amend --no-edit + caa = commit --amend --all + cana = commit --amend --all --no-edit fix = commit --all --fixup diff = diff --word-diff d = diff --word-diff dc = diff --cached dlc = diff --cached HEAD^ + ds = diff --staged dr = "!f() { git diff -w "$1"^.."$1"; }; f" diffr = "!f() { git diff "$1"^.."$1"; }; f" + # grep on filename + f = "!git ls-files | grep -i" + + g = grep -Ii gr = grep -Ii grep = grep -Ii - ls = log --pretty=format:"%C(green)%h\\ %C(yellow)[%ad]%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date = relative - ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat + ls = log --pretty=format:"%C(green)%h\\ %C(yellow)[%ad]%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate + ll = log --graph --topo-order --date=short --abbrev-commit --decorate --all --boundary --pretty=format:'%Cgreen%ad %Cred%h%Creset -%C(yellow)%d%Creset %s %Cblue[%cn]%Creset %Cblue%G?%Creset' + lll = log --graph --topo-order --date=iso8601-strict --no-abbrev-commit --abbrev=40 --decorate --all --boundary --pretty=format:'%Cgreen%ad %Cred%h%Creset -%C(yellow)%d%Creset %s %Cblue[%cn <%ce>]%Creset %Cblue%G?%Creset' + lc = "!f() { git ll "$1"^.."$1"; }; f" lnc = log --pretty=format:"%h\\ %s\\ [%cn]" + lp = log --patch fl = log -u filelog = log -u - lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit - lga = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --all + lg = log --graph --pretty=format:"%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset" --abbrev-commit + lga = log --graph --pretty=format:"%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset" --abbrev-commit --all # tag logs taglog = "log --tags --simplify-by-decoration --pretty='format:%ci %d'" @@ -94,11 +107,14 @@ ps = push please = push --force-with-lease - rem = remote + rem = remote + remp = remote prune + remu = remote update rb = rebase rba = rebase --abort rbc = rebase --continue + rbi = rebase --interactive r = reset r1 = reset HEAD^ @@ -117,54 +133,14 @@ sw = switch - # grep on filename - f = "!git ls-files | grep -i" - lc = "!f() { git ll "$1"^.."$1"; }; f" - svnr = svn rebase - svnd = svn dcommit - svnl = svn log --oneline --show-commit - assume = update-index --assume-unchanged - unassume = update-index --no-assume-unchanged - # show assumed files - assumed = "!git ls-files -v | grep ^h | cut -c 3-" - # unassume all the assumed files - unassumeall = "!git assumed | xargs git update-index --no-assume-unchanged" - assumeall = "!git status -s | awk {'print $2'} | xargs git assume" - # add + # add subtree sba = "!f() { git subtree add --prefix $2 $1 master --squash; }; f" - # update/pull + # update/pull subtree sbu = "!f() { git subtree pull --prefix $2 $1 master --squash; }; f" - # last tag created - lasttag = "describe --tags --abbrev=0" - lt = "describe --tags --abbrev=0" - - # conflict/merges - ours = "!f() { git co --ours $@ && git add $@; }; f" - theirs = "!f() { git co --theirs $@ && git add $@; }; f" - - #list remotes - rem="!git config -l | grep remote.*url | tail -n +2" - - #apply patch from other local repo - lap = "!f() { git --git-dir=$1 format-patch -k -1 --stdout $2 | git am -3 -k; }; f" - - #open markdown files edited in last commit - last = "!gvim $(git show HEAD --format="" --name-only | grep -e .*md$ | xargs)" - #open just created markdown in working directory - newmd = "!gvim $(git status -s | awk {'print $2'})" # initial empty commit empty = "!git commit -am\"[empty] Initial commit\" --allow-empty" - # list all aliases - la = "!git config -l | grep alias | cut -c 7-" - # grep from root folder - gra = "!f() { A=$(pwd) && TOPLEVEL=$(git rev-parse --show-toplevel) && cd $TOPLEVEL && git grep --full-name -In $1 | xargs -I{} echo $TOPLEVEL/{} && cd $A; }; f" - #rename branch tree to done- - done = "!f() { git branch | grep "$1" | cut -c 3- | grep -v done | xargs -I{} git branch -m {} done-{}; }; f" - #add bitbucket remote - ra = "!f() { git remote add $1 https://bitbucket.org/$2.git; }; f" wl = worktree list - # undo from here http://megakemp.com/2016/08/25/git-undo/ - undo = "!f() { git reset --hard $(git rev-parse --abbrev-ref HEAD)@{${1-1}}; }; f" + serve = !git daemon --reuseaddr --verbose --base-path=. --export-all ./.git |