frebib/dotfiles
1
0
Fork 0
mirror of https://github.com/frebib/dotfiles.git synced 2024-06-14 12:57:23 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into surface

Browse Source
This commit is contained in:
Joe Groocock 2018-01-31 15:10:19 +00:00
commit 52cb279f3b
Signed by: frebib
GPG Key ID: E0B16BEACFBB6A86
3 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.config/git/config
View File

@ -20,6 +20,7 @@
rebase = true rebase = true
[core] [core]
autocrlf = input autocrlf = input
excludesfile = /home/frebib/.config/git/gitignore
[diff] [diff]
algorithm = patience algorithm = patience
[sendemail] [sendemail]

1
.config/git/gitignore Normal file
View File

@ -0,0 +1 @@
.idea/

2
aliases
View File

@ -93,6 +93,7 @@ alias -s git="git clone --recursive"
# Git Aliases # Git Aliases
alias g=git alias g=git
alias gignore='$EDITOR .gitignore' alias gignore='$EDITOR .gitignore'
alias ggignore='$EDITOR ~/.config/git/gitignore'
alias gcl="git clone --recursive" alias gcl="git clone --recursive"
alias gco="git checkout" alias gco="git checkout"
alias gcom="git checkout master" alias gcom="git checkout master"
@ -249,6 +250,7 @@ alias ssha='eval `ssh-agent` ; ssh-add'
alias aliases="$EDITOR $DOTFILES/aliases ; exec zsh" alias aliases="$EDITOR $DOTFILES/aliases ; exec zsh"
alias vimrc="$EDITOR $MYVIMRC" alias vimrc="$EDITOR $MYVIMRC"
alias zshrc="$EDITOR ~/.zshrc ; exec zsh" alias zshrc="$EDITOR ~/.zshrc ; exec zsh"
alias gitrc="$EDITOR ~/.config/git/config"
alias xinitrc="$EDITOR ~/.xinitrc" alias xinitrc="$EDITOR ~/.xinitrc"
alias xresources="$EDITOR ~/.Xresources ; xrdb merge ~/.Xresources" alias xresources="$EDITOR ~/.Xresources ; xrdb merge ~/.Xresources"
alias xsession="$EDITOR ~/.xsession" alias xsession="$EDITOR ~/.xsession"