From dec3d55071393fd96520f3926465e5edd4ed0982 Mon Sep 17 00:00:00 2001
From: Chris Coley <chris@codingallnight.com>
Date: Wed, 19 Oct 2016 09:59:37 -0700
Subject: [PATCH] Adding 2 aliases for commit
 fe33c524111219d843f5b3eb0e67f1245ed342f7 Author: Chris Coley
 <chris@codingallnight.com> Date:   Mon Oct 10 01:46:17 2016 -0700

    Adding a shortcut to toggle vertical rulers on lines 81 and 121

commit f5b13f8eb754f50477a2c2f1a824e957f36f9dc2
Author: Chris Coley <chris@codingallnight.com>
Date:   Mon Oct 10 01:45:56 2016 -0700

    Adding a syntax file for github flavored markdown

commit 2be246bcd51ba42df0f30fc0b4092e4c000004f2
Author: Chris Coley <chris@codingallnight.com>
Date:   Wed Sep 28 18:22:31 2016 +0000

    Commenting out the venv stuff in bashrc.local.example so that the enabled options represent a better default configuration.

commit 92a6c1a155e7586ea37b56b098c66fbaf4b52ffd
Author: chris <chris@codingallnight.com>
Date:   Wed Jan 20 15:45:38 2016 -0800

    Adding color comments to the registry files.

commit 03360136b6fb9494847481442651e79e77e37eca
Author: Chris Coley <chris@codingallnight.com>
Date:   Mon Jan 4 11:22:40 2016 -0800

    Adding the VIM 'write with sudo' trick to vimrc as a mapping

commit 8056f614ceaa257139271cdf490ebde0f5082b1f
Author: Chris Coley <chris@codingallnight.com>
Date:   Mon Jan 4 09:31:59 2016 -0800

    Replacing Tabs with Spaces

commit 4da6954ab840a983fddfc529ddadbae5834cd6cc
Author: Chris Coley <chris@codingallnight.com>
Date:   Sun Jan 3 20:32:54 2016 -0800

    Updating vimrc to use soft tabs

commit 16eb83209cf8e14189a61b03d5a2c75395681d75
Author: Chris Coley <chris@codingallnight.com>
Date:   Thu Dec 31 09:04:56 2015 -0800

    Tabs vs Spaces

commit 280b39cad47a6525feb5b9bcef9e369023775cb1
Author: Chris Coley <chris@codingallnight.com>
Date:   Thu Dec 31 08:58:27 2015 -0800

    Updating the username and email in gitconfig. Also setting a default editor

commit 326456846c589bbe51438b735d411914dc9fd923
Author: Chris Coley <chris@codingallnight.com>
Date:   Sun Dec 13 00:57:49 2015 -0800

    Small tweaks

commit 93acd8855f343eba3c62b675bbe610a4e236d52b
Author: chris <chris@codingallnight.com>
Date:   Sat Dec 12 23:46:50 2015 -0800

    Forgot the newline at the end of the public key

commit 9e62b0225db308f4f2e2191645c146452a2a1b29
Author: chris <chris@codingallnight.com>
Date:   Sat Dec 12 23:36:41 2015 -0800

    Adding the public key for my laptop

commit 2168713e47ccb5500c15aee5a0eb546f1c630cbf
Author: Chris Coley <chris@codingallnight.com>
Date:   Thu Nov 26 22:31:26 2015 -0800

    Fixing the color() function

commit 9ff65c1e0679b9838f75cc02d9cd558a6fcd504b
Author: chris <chris@codingallnight.com>
Date:   Wed Nov 18 15:33:53 2015 -0800

    Updating the autocrlf setting.

commit 71a448f8d6f2ffd4a4394389030abcd0742aa30a
Author: Chris Coley <chris@codingallnight.com>
Date:   Mon Nov 9 11:33:23 2015 -0800

    Adding autocrlf setting to gitconfig

commit e472912716465c013d7eccb9e295681b35e3bc19
Author: Chris Coley <chris@codingallnight.com>
Date:   Fri Oct 30 11:24:48 2015 -0700

    Adding a timezone alias

commit 7a8b68e1f21c2a4d4584d21f8d14871b3797c3ce
Author: Chris Coley <chris@codingallnight.com>
Date:   Fri Oct 30 09:49:35 2015 -0700

    Moved all the example files and directories into a single directory, and then tar'd it up

commit 8a81b2900feaa12b4cde78b371b451340551bb08
Author: chris <chris@codingallnight.com>
Date:   Fri Oct 30 09:30:58 2015 -0700

    Adding README

commit 4ed062bf726b79c9070eaf229e373fd603b84e4a
Author: Chris Coley <chris@codingallnight.com>
Date:   Wed Oct 14 16:42:50 2015 -0700

    Now I see why I put the comment in the alias. Try this.

commit 263f84a3d7c7b73169f3ecd6fa9c54bcf4096097
Author: Chris Coley <chris@codingallnight.com>
Date:   Wed Oct 14 16:34:12 2015 -0700

    I'm an idiot. Why did I put the comment in the alias? Fixing my idiocy.

commit 3d877a7c82be07288c0df0fe0be0f8b3be0645ba
Author: Chris Coley <chris@codingallnight.com>
Date:   Mon Oct 5 10:28:30 2015 -0700

    Updating the 'free' alias

commit 2eeb1ef6c8fd816ec693f3d320e3b0bbf75555d8
Author: Chris Coley <chris@codingallnight.com>
Date:   Mon Oct 5 09:10:05 2015 -0700

    Making the color alias into a function.
    Also adding an alias for all the custom function so that they show up in the output of the alias command.

commit 87b8fc7a573e349ba2d7d13a165fb254993adb48
Author: Chris Coley <chris@codingallnight.com>
Date:   Sun Sep 6 23:12:32 2015 -0700

    Updated vimrc to change terminal title to user@hostname upon exiting Vim

commit 6b3f0b0ce708849eddf2e21d54e42482480bbfe2
Author: Chris Coley <chris@codingallnight.com>
Date:   Sun Sep 6 22:54:47 2015 -0700

    Whitespace

commit 24f0f4ce97da31769a463fe85dfe217a18adde6c
Author: Chris Coley <chris@codingallnight.com>
Date:   Sun Sep 6 22:54:17 2015 -0700

    Updating putty profiles to use UTF-8 for remote character set

commit 700b2ae006488c17160f2f7bb841fd2d9bacc089
Author: Chris Coley <chris@codingallnight.com>
Date:   Sun Sep 6 22:20:40 2015 -0700

    Refactoring bashrc and moving Git auto completion and Git prompt to  where they belong. Also adding my current  as an example.

commit 7ee3e90de90f73cccd988c6c9545be1b2e1d149c
Author: Chris Coley <chris@codingallnight.com>
Date:   Sun Sep 6 21:02:34 2015 -0700

    Adding hostname and git branch name to bash prompt

commit 489df8e1f461bdfe53aa1fa559c7a04052371dfb
Author: Chris Coley <chris@codingallnight.com>
Date:   Sun Sep 6 20:59:22 2015 -0700

    Updating the install script to not overwrite the *.old files it cretes

commit 5df804f34edd1f03f3c7ae1b9fd83ccf6b5d0c4c
Author: Chris Coley <chris@codingallnight.com>
Date:   Tue Aug 18 12:40:47 2015 -0700

    Added numpad mapping to vimrc in case disabling application keypad mode in Putty isn't an option

commit b582297086a495f6d96c1734fa016497d1020f84
Author: Chris Coley <chris@codingallnight.com>
Date:   Tue Aug 18 12:07:40 2015 -0700

    Updating putty profiles to enable numpad in Vim

commit b6c9d98f6f9902c870a531ee9046ee46d07af519
Author: Chris Coley <chris@codingallnight.com>
Date:   Tue Aug 11 14:54:35 2015 -0700

    Added `lh` as an alias of `ls` that shows human readable sizes.

commit 807332fc8a9439a02d93a612a0c4517757b75d3c
Author: Chris Coley <chris@codingallnight.com>
Date:   Mon Aug 3 15:58:42 2015 -0700

    Adding public key for work desktop

commit c1edb698f0ce89f60cd7814124924cf0a6450e42
Author: Chris Coley <chris@codingallnight.com>
Date:   Fri Apr 3 13:43:00 2015 -0700

    Removing old ssh key from Geary iMac

commit 560b980731779f7ed4000fe282ca3cd5e53cd4c9
Author: Chris Coley <chris@codingallnight.com>
Date:   Tue Jan 20 17:31:59 2015 -0800

    Moving the .gitignore to a more logical place

commit f0e1c5d7c1d7d51c714089e07dc7da4b977a2bd6
Author: Chris Coley <chris@codingallnight.com>
Date:   Tue Jan 20 17:21:28 2015 -0800

    Adding .gitignore for vim/

commit 9eb9d18ef54b27a7a42734d25cc7d3292a056750
Author: Chris Coley <chris@codingallnight.com>
Date:   Tue Jan 20 15:07:16 2015 -0800

    Show group in ls aliases

commit 28b5383f0120148250e50f71eea5329b132ac958
Author: Chris Coley <chris@codingallnight.com>
Date:   Tue Dec 23 15:32:09 2014 -0800

    Changing vimrc to use tabs instead of spaces for indentation

commit 30b2a2900c7557dd5467c3fac86de41ef6f88ff4
Merge: fe37335 122dbd8
Author: Chris Coley <chris@codingallnight.com>
Date:   Mon Dec 8 13:19:57 2014 -0800

    Merge branch 'master' of github.com:ccoley/dotfiles

commit fe373356beb70ecc37b7071dbff9ab921486bb51
Author: Chris Coley <chris@codingallnight.com>
Date:   Mon Dec 8 13:19:17 2014 -0800

    bashrc should allow local by default. Also setting tabstop to match softtabstop in vimrc

commit 122dbd8ded4592a525a19faaef23354dfe4db5a2
Author: Chris Coley <chris@codingallnight.com>
Date:   Thu Oct 16 16:12:02 2014 -0700

    Add color to ls command

commit a594249ddd5ce62c07f32d735843e250dc5b30e7
Author: Chris Coley <chris@codingallnight.com>
Date:   Sun Oct 12 18:27:34 2014 -0700

    Adding registry edit files for Putty solarized colors

commit 2282aea6ca416284db05b8422e67fe2ef71a4aba
Author: Chris Coley <chris@codingallnight.com>
Date:   Sun Oct 12 18:22:11 2014 -0700

    Redo of dotfiles

commit fea9e5ed9d2a64e4af2ea7f3948f03860a4605ec
Author: Chris Coley <chris@codingallnight.com>
Date:   Sun Oct 12 16:01:29 2014 -0700

    Adding example files to use when testing syntax highlighting, etc...

commit a16f4e9e4a7a4348abbc039fcc7651ea681ae442
Author: Chris Coley <chris@codingallnight.com>
Date:   Sat Oct 11 00:54:03 2014 -0700

    Create chris-desktop.pub

commit 2be5dc2c29830230590dddd0b4a5b826713b40ba
Author: Chris Coley <chris@codingallnight.com>
Date:   Thu Oct 9 10:55:27 2014 -0700

    Removing username and hostname from public key

commit dbe45a82add687ee99f772d4032e9d1be87fb240
Author: Chris Coley <chris@codingallnight.com>
Date:   Thu Oct 9 10:42:56 2014 -0700

    Adding work computer SSH key

commit 46110c2270a2c66d4369988d72ec35eebffe8e11
Author: Chris Coley <chris@codingallnight.com>
Date:   Mon Sep 15 18:14:12 2014 -0700

    big clean up of dotfiles

commit dc34f4f89110113b4ecf98200d05f91406fd75ce
Author: Chris Coley <chris@codingallnight.com>
Date:   Wed Sep 10 17:10:57 2014 -0700

    Update .gitconfig

commit 5f7639d87a2edbc2f7c020772ec86f7e1648b262
Author: Chris Coley <chris@codingallnight.com>
Date:   Wed Sep 10 17:10:45 2014 -0700

    Update .gitconfig

commit 85301edfa20b715ba6f2140d557c63ca9cdfae36
Author: Chris Coley <chris@codingallnight.com>
Date:   Wed Sep 10 17:09:09 2014 -0700

    Update .gitconfig

commit c47bf54d312fce1bc7d1ebdec2b41dfef4d7698d
Author: Chris Coley <chris@codingallnight.com>
Date:   Fri May 30 23:21:42 2014 -0700

    Added count function to .bashrc

commit e1b31768d5c9f2044ffe095da221b9afe46fad05
Author: Chris Coley <chris@codingallnight.com>
Date:   Mon Apr 28 13:45:53 2014 -0700

    Delete .dircolors

commit 3067aa29083b5179e84b17e7a5a1f29afca6fcf7
Author: Chris Coley <chris@codingallnight.com>
Date:   Mon Feb 24 15:55:22 2014 -0800

    Added more 'cd ..' alias levels

commit be881b62be1d82c2014dd27c59fde768008e98f5
Author: Chris Coley <chris@codingallnight.com>
Date:   Mon Feb 17 03:50:12 2014 -0800

    Update .bash_aliases

commit c7d777f500da46d279e4748dbd7ce7d5dfa3b1c1
Author: Chris Coley <chris@codingallnight.com>
Date:   Mon Feb 17 11:16:09 2014 +0000

    first commit
---
 gitconfig | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/gitconfig b/gitconfig
index eaa4106..eb5027f 100644
--- a/gitconfig
+++ b/gitconfig
@@ -5,12 +5,16 @@
     default = simple
 [credential]
     helper = cache --timeout=43200
+[core]
+    #autocrlf = true  # Windows
+    autocrlf = input # Linux
+    editor = vim
 [alias]
     alias = config --get-regexp ^alias\\.
     stat = status
     last = log -1 HEAD
     unstage = reset HEAD --
-[core]
-    #autocrlf = true  # Windows
-    autocrlf = input # Linux
-    editor = vim
+    lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
+    ll = log --pretty=format:'%C(yellow)%h%Cred%d %Creset%s%Cblue [%cn]' --decorate --numstat
+
+# vim: set ft=gitconfig: 
-- 
GitLab