[user]
name = Hendrik Jäger
email = gitcommit@henk.geekmail.org
+ signingKey = 0x1B7EADFDDF720123
[branch]
# always make new branches rebase on their tracking branch
autosetuprebase = always
+[commit]
+ # show diff in commit message editor
+ verbose = true
+[core]
+ # complain about tabs used for indenting
+ whitespace = tab-in-indent
[diff]
# use (i)ndex, (w)orktree, (c)ommit, etc instead of a/ and b/
mnemonicprefix = true
renames = copies
# use different color for moved code (default == zebra, currently)
colorMoved = default
+ # use vimdiff as difftool
+ tool = vimdiff
+[difftool]
+ # do not prompt before invoking difftool
+ prompt = false
[fetch]
# delete tracking references and info about remote branches
# does not delete any branches
prune = true
+[format]
+ # show a lot of info by default
+ pretty=compact
[grep]
# show linenumber (-n)
lineNumber = true
+[log]
+ # show short commit sha
+ abbrevCommit = true
+ # show short ref names but only in terminal
+ decorate = auto
[merge]
# only do fastforward merges
ff = only
+ # use vimdiff as mergetool
+ tool = vimdiff
+[pretty]
+ compact = %C(auto)%h%Cgreen% cs%Cblue%<(15,trunc)% an%C(auto)%d%Creset% s
[push]
# push to branch with same name on remote
default = current
+ # also push reachable annotated tags
+ followTags = true
[pull]
# rebase, don’t merge, local changes
rebase = true
# when in a dirty worktree, automatically create a stash before and apply after rebasing
autoStash = true
# automatically squash marked commits (squash! …, fixup! …)
- autosquash = true
+ autoSquash = true
[rerere]
# don’t use rerere to resolve merge conflicts
enabled = false
[alias]
a = add
- ap = add --patch
+ aa = add --all
ai = add --interactive
+ ap = add --patch
+ au = add --update
b = branch
br = branch
cpa = cherry-pick --abort
cpc = cherry-pick --continue
- ci = commit
- cm = commit -m
- cma = commit --all -m
- cmv = commit --all --verbose
- ca = commit --amend
- amend = commit --amend
- caa = commit --all --amend --reuse-message=HEAD
+ c = commit
+ ca = commit --all
+ cm = commit --message
+ cam = commit --all --message
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
- lnc = log --pretty=format:"%h\\ %s\\ [%cn]"
- 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
+ l = log
+ la = log --graph --all
+ lp = log --patch
# tag logs
taglog = "log --tags --simplify-by-decoration --pretty='format:%ci %d'"
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^
rh1 = reset --hard HEAD^
rh2 = reset --hard HEAD^^
+ rs = restore
+
sl = stash list
sa = stash apply
ss = stash save
- s = status --short
st = status --short
- # 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
+ sw = switch
+
+ # 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
+
+ serve = daemon --reuseaddr --verbose --base-path=. --export-all ./.git
projects / user / henk / vcsh / git.git / blobdiff