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

add mergef and incoming git aliases

Browse Source
This commit is contained in:
Josh Holtrop 2011-08-05 11:31:14 -04:00
parent 110cd8c18b
commit f8d5fa4438
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bash_aliases
View File

@ -93,6 +93,8 @@ function git-config-joshs()
git config --global core.excludesfile ${HOME}/.gitignore git config --global core.excludesfile ${HOME}/.gitignore
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.incoming '!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'
if [ -e /bin/cygwin1.dll ]; then if [ -e /bin/cygwin1.dll ]; then