X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=.config%2Fgit%2Fconfig;h=4916f4aa2d87e299b54432f773dd34fef1a280bf;hb=c25ff5d0ca2e07a4ae406e83234e9442579c84f9;hp=e49790f28d61e7a179299f6978c3f062f2dff69f;hpb=b4edf20a36c66726a5469f6a67d66954cbd97be1;p=user%2Fhenk%2Fvcsh%2Fgit.git

diff --git a/.config/git/config b/.config/git/config
index e49790f..4916f4a 100644
--- 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
@@ -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"