diff --git a/config/.gitconfig b/config/.gitconfig index 537d598..ebf136e 100644 --- a/config/.gitconfig +++ b/config/.gitconfig @@ -7,13 +7,13 @@ [push] default = simple [alias] - tree = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold cyan)<%an>%Creset' --abbrev-commit --date=relative - drqs = "!f(){ git checkout -b feature/DRQS$1; }; f" - svnsync = "!f(){ git co master && git pull && ssh devgit svnsync $(git config --get remote.origin.url | cut -d : -f 2 );}; f" + tree = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold cyan)<%an>%Creset' --abbrev-commit --date=relative + top = "!f() { GIT_TOP=\"${GIT_DIR%%/.git/modules/*}\"; [ \".$GIT_TOP\" != \".$GIT_DIR\" ] && cd \"$GIT_TOP\"; exec \"$@\"; }; f" st = status br = branch co = checkout ci = commit + svnsync = "!f(){ git co master && git pull && ssh devgit svnsync $(git config --get remote.origin.url | cut -d : -f 2 );}; f" [merge] tool = vimdiff conflictstyle = diff3