Add default format

[user/henk/vcsh/git.git] / .config / git / config

diff --git a/.config/git/config b/.config/git/config
index c2c48be0c14ea08c0487760194af56a4476a4bc3..4916f4aa2d87e299b54432f773dd34fef1a280bf 100644 (file)
--- a/.config/git/config
+++ b/.config/git/config
@@ -16,6 +16,9 @@
   # delete tracking references and info about remote branches
   # does not delete any branches
   prune = true
+[format]
+  # show a lot of info by default
+  pretty=fuller
 [grep]
   # show linenumber (-n)
   lineNumber = true
@@ -41,13 +44,12 @@
 
 [alias]
   a  = add
-  ap = add -p
+  ap = add --patch
   ai = add --interactive
 
   b      = branch
   br     = branch
-  branch = branch -ra
-  bra    = branch -ra
+  bra    = branch --all
 
   co  = checkout
   cob = checkout -b
@@ -58,12 +60,12 @@
 
   ci    = commit
   cm    = commit -m
-  cma   = commit -a -m
-  cmv   = commit -a -v
+  cma   = commit --all -m
+  cmv   = commit --all --verbose
   ca    = commit --amend
   amend = commit --amend
-  caa   = commit -a --amend -C HEAD
-  fix   = commit -a --fixup
+  caa   = commit --all --amend --reuse-message=HEAD
+  fix   = commit --all --fixup
 
   diff  = diff --word-diff
   d     = diff --word-diff
@@ -75,13 +77,13 @@
   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]"
+  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
+  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'"
 
@@ -101,15 +103,15 @@
   r1  = reset HEAD^
   r2  = reset HEAD^^
   rh  = reset --hard
-  rh1 = reset HEAD^ --hard
-  rh2 = reset HEAD^^ --hard
+  rh1 = reset --hard HEAD^
+  rh2 = reset --hard HEAD^^
 
   sl = stash list
   sa = stash apply
   ss = stash save
 
-  s  = status -s
-  st = status -s
+  s  = status --short
+  st = status --short
 
   # grep on filename
   f = "!git ls-files | grep -i"