josh/files
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bash_aliases: remove incoming/outgoing git aliases

Browse Source 
FETCH_HEAD does not behave as I expected with multiple branches
This commit is contained in:
Josh Holtrop 2011-09-27 10:38:47 -04:00
parent 297e251d7d
commit 5b77fca9b9
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bash_aliases
View File

@ -94,8 +94,6 @@ function git-config-joshs()
git config --global core.pager 'less -FRXi' git config --global core.pager 'less -FRXi'
git config --global alias.dc 'diff --cached' git config --global alias.dc 'diff --cached'
git config --global alias.mergef 'merge FETCH_HEAD' git config --global alias.mergef 'merge FETCH_HEAD'
git config --global alias.incoming '!git fetch; git log ..FETCH_HEAD'
git config --global alias.outgoing '!git fetch; git log FETCH_HEAD..'
git config --global alias.gdiff 'difftool -y -t gvimdiff' git config --global alias.gdiff 'difftool -y -t gvimdiff'
git config --global alias.gdiffc 'difftool -y -t gvimdiff --cached' git config --global alias.gdiffc 'difftool -y -t gvimdiff --cached'
git config --global alias.wdiff 'diff --word-diff=color' git config --global alias.wdiff 'diff --word-diff=color'