Mercurial > dotfiles

changeset 292:6938fb0146f5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add stuff to `gitconfig`, use better installation for it.
author Ludovic Chabant <ludovic@chabant.com>
date Fri, 20 Mar 2015 15:15:20 -0700
parents aac9b5b1f921
children e2a48fb5e143
files git/gitconfig install.cmd install.sh
diffstat 3 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/git/gitconfig	Thu Mar 19 17:06:31 2015 -0700
+++ b/git/gitconfig	Fri Mar 20 15:15:20 2015 -0700
@@ -5,3 +5,8 @@
 [push]
 default = simple
 
+[alias]
+lg1 = log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all
+lg2 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n''          %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all
+lg = !"git lg1"
+
--- a/install.cmd	Thu Mar 19 17:06:31 2015 -0700
+++ b/install.cmd	Fri Mar 20 15:15:20 2015 -0700
@@ -39,7 +39,8 @@
     set /P confirm=Will delete existing "%userprofile%\.gitconfig". OK with that? Press CTRL-C to abort.
     del /Q "%userprofile%\.gitconfig"
 )
-copy "%CWD%git\gitconfig" "%userprofile%\.gitconfig"
+echo [include] > "%userprofile%\.gitconfig"
+echo path = %CWD:\=/%git/gitconfig >> "%userprofile%\.gitconfig"
 
 :: Web Browser
 if exist "%userprofile%\_pentadactylrc" (
--- a/install.sh	Thu Mar 19 17:06:31 2015 -0700
+++ b/install.sh	Fri Mar 20 15:15:20 2015 -0700
@@ -34,7 +34,7 @@
 
 # GIT
 # ---
-cp "$CWD/git/gitconfig" "$HOME/.gitconfig"
+ln -s "$CWD/git/gitconfig" "$HOME/.gitconfig"
 
 # WEB BROWSER
 # -----------