Use tabs

.gitconfig

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