More GIT config things.

Configure a bunch of GIT core things some more: mainly colours, but also
handy aliases for making and mailing patches.

Also include configuration for Tig, a curses-based GIT porcelain.

diff --git a/gitconfig b/gitconfig
index d898e71915f5d0b6b1b64999dbcb268aff6d72ec..1e9c70614b65b3fb001b9497d88b79e0926c56cd 100644 (file)
--- a/gitconfig
+++ b/gitconfig
@@ -1,3 +1,6 @@
+[core]
+       filemode = true
+

 [user]
        name = Mark Wooding
        email = <mdw@distorted.org.uk>
 [user]
        name = Mark Wooding
        email = <mdw@distorted.org.uk>


@@ -8,7 +11,38 @@
 [diff]
        renames = copies
 
 [diff]
        renames = copies
 

+[format]
+       headers = "Organization: Straylight/Edgeware\n"
+

 [color]
        diff = auto
        status = auto
        branch = auto
 [color]
        diff = auto
        status = auto
        branch = auto

+
+[color "diff"]
+       plain = normal
+       meta = bold
+       new = bold green
+       old = bold red
+       commit = bold yellow
+       whitespace = reverse red
+
+[color "status"]
+       header = bold
+       added = bold green
+       changed = bold blue
+       untracked = bold red
+
+[color "branch"]
+       current = bold
+       local = normal
+       remote = cyan
+
+[alias]
+       egrep = "grep -E"
+       patch = "format-patch -o p -s"
+       mailto = "send-email \
+                       --quiet \
+                       --no-chain-reply-to \
+                       --no-signed-off-by-cc \
+                       --to"

diff --git a/setup b/setup
index 53438c71a98534dd914b9e2b72b4093a1424556d..194e1bc9c6b399ef40107a1669888c041292f36d 100755 (executable)
--- a/setup
+++ b/setup
@@ -145,7 +145,7 @@ dotfiles="
   bash_profile bash_logout bashrc inputrc bash_completion
   emacs emacs-calc 
   vm mailrc signature
   bash_profile bash_logout bashrc inputrc bash_completion
   emacs emacs-calc 
   vm mailrc signature

-  gitconfig cgrc stgitrc
+  gitconfig cgrc stgitrc tigrc

   lisp-init.lisp:.cmucl-init.lisp
     lisp-init.lisp:.sbclrc
     lisp-init.lisp:.clisprc.lisp
   lisp-init.lisp:.cmucl-init.lisp
     lisp-init.lisp:.sbclrc
     lisp-init.lisp:.clisprc.lisp

diff --git a/tigrc b/tigrc
new file mode 100644 (file)
index 0000000..9931d71
--- /dev/null
+++ b/tigrc
@@ -0,0 +1,47 @@
+### tig config
+
+set tab-size = 8
+set show-rev-graph = yes
+set commit-encoding = ISO-8859-1
+
+color title-blur cyan blue
+color title-focus white blue bold
+
+color main-date red default
+color main-author magenta default bold
+color main-commit default default
+color main-delim green default bold
+color main-tag yellow default bold
+color main-ref cyan default bold
+
+color diff-header yellow default bold
+color diff-index default default bold
+color diff-chunk cyan default
+color diff-add green default bold
+color diff-del red default bold
+color diff-oldmode red default
+color diff-newmode green default
+color diff-copy-from red default
+color diff-copy-to green default
+color diff-rename-from red default
+color diff-rename-to green default
+##color diff-similarity
+##color diff-dissimilarity
+##color diff-tree
+
+color pp-author green default bold
+color pp-commit green default bold
+color pp-merge green default bold
+color pp-date green default bold
+color pp-adate green default bold
+color pp-cdate green default bold
+color pp-refs green default bold
+
+color commit green default
+color parent green default
+color tree green default
+color author green default
+color committer green default
+
+color signoff blue default
+color acked blue default