summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAssaf Gordon <assafgordon@gmail.com>2016-02-22 22:28:01 (GMT)
committerAssaf Gordon <assafgordon@gmail.com>2016-02-22 22:28:01 (GMT)
commitd5f96962554d061440052f8f1647fedd1590d388 (patch)
tree48a1159d3fe6fa83a8d659a6d14578206bd0ce63
parentede6e0a55b6e61d600efa5808b7420b1445da395 (diff)
downloaddot-files-d5f96962554d061440052f8f1647fedd1590d388.zip
dot-files-d5f96962554d061440052f8f1647fedd1590d388.tar.gz
dot-files-d5f96962554d061440052f8f1647fedd1590d388.tar.bz2
gitconfig: new file
-rw-r--r--gitconfig76
1 files changed, 76 insertions, 0 deletions
diff --git a/gitconfig b/gitconfig
new file mode 100644
index 0000000..dd6eb83
--- /dev/null
+++ b/gitconfig
@@ -0,0 +1,76 @@
+[user]
+ name = Assaf Gordon
+ email = assafgordon@gmail.com
+[color]
+ ui=auto
+
+[color "branch"]
+ current = yellow reverse
+ local = yellow
+ remote = green
+[color "diff"]
+ meta = yellow bold
+ frag = magenta bold
+ old = red bold
+ new = green bold
+ whitespace = red reverse
+
+[color "status"]
+ added = yellow
+ changed = green
+ untracked = cyan
+[core]
+ whitespace=fix,-indent-with-non-tab,trailing-space,cr-at-eol,space-before-tab
+ quotepath = false
+ pager = less -FXR
+ editor = vim -pc ':normal gg'
+
+[alias]
+ st = status --short --branch
+ stt = status --short --branch -uno
+ stu = status --short --branch -uno
+ ci = commit
+ br = branch
+ co = checkout
+ df = diff
+ lg = log -p
+ logf = log --pretty=fuller --decorate=full
+ logfull = log --pretty=fuller --decorate=full
+ logfile = log --follow
+ logfol = log --follow
+ lol = log --graph --decorate --pretty=oneline --abbrev-commit
+ lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
+ ls = ls-files
+ meld = !/home/gordon/sources/git-meld/git-meld.pl
+ desc = describe --dirty
+ id = describe --dirty
+ serve = daemon --verbose --export-all --base-path=.git --reuseaddr --strict-paths .git/
+ # Show compact history
+ l = "!git log --graph --pretty='tformat:%C(yellow)%h{%C(green)%ar{%C(bold blue)%an{%C(red)%d%C(reset) %s' $* | column -t -s '{' | less -FXRS"
+ # Show commit log using graph notation
+ lg = log --graph --pretty=format:'%Cred%h%Creset %an -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
+ # List commits showing changed files
+ ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
+ dist = "!A=$(basename $(pwd))-$(git describe --tags --always)-$(date +%F); git ls-files -z | tar --null --files-from=- -cJf $A.tar.xz --transform \"s;^;$A/;\" && echo $A.tar.xz"
+ #dist = "!A=$(basename $(pwd)tar -cJf $(basename $(pwd))-$().tar.xz --transform \"s;^;$(basename $(pwd))-$(date +%F-%H%M%S)/;\" $(git ls) && echo $(basename $(pwd))-$(date +%F-%H%M%S).tar.xz"
+
+[push]
+ default = simple
+
+[instaweb]
+local = true
+httpd = lighttpd
+port = 5151
+modulepath = /usr/lib/apache2/modules
+
+## See: http://www-verimag.imag.fr/~moy/opendocument/
+## http://stackoverflow.com/a/15663964
+##
+## In each project's directory "<PROJECT>/.git/info/attributes", add the following:
+## *.ods diff=odf
+## *.odt diff=odf
+## *.odp diff=odf
+##
+## And install the package 'odt2txt'.
+[diff "odf"]
+ textconv=odt2txt