opdavies/dotfiles
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Added assume, unassume and assumed aliases

Browse source
This commit is contained in:
Oliver Davies 2015-10-05 14:12:23 +01:00
parent ffe89801b5
commit 93c819dd74
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
.gitconfig
View file

@ -64,6 +64,21 @@
pull-develop-master-current-branch = !BRANCH=$(git current-branch) && \ pull-develop-master-current-branch = !BRANCH=$(git current-branch) && \
git fetch --all && git pull-develop && git pull-master && \ git fetch --all && git pull-develop && git pull-master && \
git checkout $BRANCH && git pull git checkout $BRANCH && git pull
# Fetch and merge the latest changes from the develop branch.
merge-origin-develop = !git fetch origin && git merge origin/develop
# Fetch and merge the latest changes from the master branch.
merge-origin-master = !git fetch origin && git merge origin/master
# Assume the specified file is unchanged to stop changes
# being seen by Git
assume = update-index --assume-unchanged
# No longer assume a specified file remains unchanged
unassume = update-index --no-assume-unchanged
# List all files that are assumed to be unchanged
assumed = !git ls-files -v | grep '^[hsmrck?]' | cut -c 3-
# Shorter commands.
mod = !git merge-origin-develop
mom = !git merge-origin-master
[core] [core]
# A global .gitignore file. # A global .gitignore file.