mirror of
https://github.com/frebib/dotfiles.git
synced 2024-06-14 12:57:23 +00:00
Merge remote-tracking branch 'origin/master' into surface
This commit is contained in:
commit
52cb279f3b
@ -20,6 +20,7 @@
|
||||
rebase = true
|
||||
[core]
|
||||
autocrlf = input
|
||||
excludesfile = /home/frebib/.config/git/gitignore
|
||||
[diff]
|
||||
algorithm = patience
|
||||
[sendemail]
|
||||
|
1
.config/git/gitignore
Normal file
1
.config/git/gitignore
Normal file
@ -0,0 +1 @@
|
||||
.idea/
|
2
aliases
2
aliases
@ -93,6 +93,7 @@ alias -s git="git clone --recursive"
|
||||
# Git Aliases
|
||||
alias g=git
|
||||
alias gignore='$EDITOR .gitignore'
|
||||
alias ggignore='$EDITOR ~/.config/git/gitignore'
|
||||
alias gcl="git clone --recursive"
|
||||
alias gco="git checkout"
|
||||
alias gcom="git checkout master"
|
||||
@ -249,6 +250,7 @@ alias ssha='eval `ssh-agent` ; ssh-add'
|
||||
alias aliases="$EDITOR $DOTFILES/aliases ; exec zsh"
|
||||
alias vimrc="$EDITOR $MYVIMRC"
|
||||
alias zshrc="$EDITOR ~/.zshrc ; exec zsh"
|
||||
alias gitrc="$EDITOR ~/.config/git/config"
|
||||
alias xinitrc="$EDITOR ~/.xinitrc"
|
||||
alias xresources="$EDITOR ~/.Xresources ; xrdb merge ~/.Xresources"
|
||||
alias xsession="$EDITOR ~/.xsession"
|
||||
|
Loading…
Reference in New Issue
Block a user