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

Use tabs

Browse source
This commit is contained in:
Oliver Davies 2017-05-08 21:49:08 +01:00
parent 0401865b89
commit 37a44c7095
1 changed files with 121 additions and 121 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
.gitconfig
View file

@ -29,7 +29,7 @@
# Print the name of the current upstream tracking branch. # Print the name of the current upstream tracking branch.
upstream = !git config --get branch.$(git current-branch).remote \ upstream = !git config --get branch.$(git current-branch).remote \
|| echo origin | echo origin
# Checkout the latest develop branch and update it. # Checkout the latest develop branch and update it.
pull-develop = !git checkout develop && git pull --rebase pull-develop = !git checkout develop && git pull --rebase
@ -40,18 +40,18 @@
# Update the develop, master and current branches. # Update the develop, master and current branches.
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 it checkout $BRANCH && git pull
# Push the current branch upstream to origin using the same branch # Push the current branch upstream to origin using the same branch
# name for the remote branch. # name for the remote branch.
upstream-current-branch = !git push --set-upstream origin \ upstream-current-branch = !git push --set-upstream origin \
$(git current-branch) (git current-branch)
rebase-against-master = !git fetch --all \ rebase-against-master = !git fetch --all \
&& git rebase $(git upstream)/master & git rebase $(git upstream)/master
rebase-against-develop = !git fetch --all \ rebase-against-develop = !git fetch --all \
&& git rebase $(git upstream)/master & git rebase $(git upstream)/master
## Shorterned 'New' commands. ## Shorterned 'New' commands.
cic = !git create-initial-commit cic = !git create-initial-commit
@ -172,8 +172,8 @@
insteadOf = drupal: insteadOf = drupal:
[pull] [pull]
rebase = true
ff = only ff = only
rebase = true
[merge] [merge]
defaultToUpstream = true defaultToUpstream = true