From 37a44c7095a18a09e698f489fb953c0cf24c950e Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Mon, 8 May 2017 21:49:08 +0100 Subject: [PATCH] Use tabs --- .gitconfig | 242 ++++++++++++++++++++++++++--------------------------- 1 file changed, 121 insertions(+), 121 deletions(-) diff --git a/.gitconfig b/.gitconfig index 1d2b854..838e1cf 100644 --- a/.gitconfig +++ b/.gitconfig @@ -1,180 +1,180 @@ [alias] - ## 'New' commands. - create-initial-commit = !git commit -m 'Initial commit' --allow-empty - hard-reset = !git reset --hard $(git upstream)/$(git current-branch) - # 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- - # Create a new branch. - create-new-branch = checkout -b - # Add a commit that fixes another (to be used with `rebase -i`). - fixup = commit --fixup - noff = merge --no-ff - prune = remote prune origin - remotes = remote -v - staged = diff --staged - undo = reset --hard - unstage = reset HEAD -- - wipe = clean -fd - word-diff = diff --word-diff - ls = log --pretty=format:"%C(green)%h\\ %C(yellow)[%ad]%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=relative - ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat + ## 'New' commands. + create-initial-commit = !git commit -m 'Initial commit' --allow-empty + hard-reset = !git reset --hard $(git upstream)/$(git current-branch) + # 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- + # Create a new branch. + create-new-branch = checkout -b + # Add a commit that fixes another (to be used with `rebase -i`). + fixup = commit --fixup + noff = merge --no-ff + prune = remote prune origin + remotes = remote -v + staged = diff --staged + undo = reset --hard + unstage = reset HEAD -- + wipe = clean -fd + word-diff = diff --word-diff + ls = log --pretty=format:"%C(green)%h\\ %C(yellow)[%ad]%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=relative + ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat - # Print the name of the current branch. - current-branch = symbolic-ref --short HEAD + # Print the name of the current branch. + current-branch = symbolic-ref --short HEAD - # Print the name of the current upstream tracking branch. - upstream = !git config --get branch.$(git current-branch).remote \ - || echo origin + # Print the name of the current upstream tracking branch. + upstream = !git config --get branch.$(git current-branch).remote \ + | echo origin - # Checkout the latest develop branch and update it. - pull-develop = !git checkout develop && git pull --rebase + # Checkout the latest develop branch and update it. + pull-develop = !git checkout develop && git pull --rebase - # Checkout the latest master branch and update it. - pull-master = !git checkout master && git pull --rebase + # Checkout the latest master branch and update it. + pull-master = !git checkout master && git pull --rebase - # 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 + # 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 && \ + 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) + # 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) - rebase-against-master = !git fetch --all \ - && git rebase $(git upstream)/master + rebase-against-master = !git fetch --all \ + & git rebase $(git upstream)/master - rebase-against-develop = !git fetch --all \ - && git rebase $(git upstream)/master + rebase-against-develop = !git fetch --all \ + & git rebase $(git upstream)/master - ## Shorterned 'New' commands. - cic = !git create-initial-commit - red = !git rebase-against-develop - rem = !git rebase-against-master - w = !git word-diff - wip = !git work-in-progress + ## Shorterned 'New' commands. + cic = !git create-initial-commit + red = !git rebase-against-develop + rem = !git rebase-against-master + w = !git word-diff + wip = !git work-in-progress - # Shorterned existing commands. - a = add - aa = add --all --intent-to-add - ap = add --patch - au = add -u - b = branch - bd = branch --delete - c = commit -v - ca = commit --amend - caa = commit --amend -C HEAD - cl = clone --recursive - co = checkout - cop = checkout -p - d = diff - f = fetch --all - g = grep --break --heading - m = merge --ff-only - nb = !git create-new-branch - p = push - rb = rebase - rba = rebase --abort - rbc = rebase --continue - rbi = rebase --interactive - s = status - sb = show-branch -a - dt = difftool + # Shorterned existing commands. + a = add + aa = add --all --intent-to-add + ap = add --patch + au = add -u + b = branch + bd = branch --delete + c = commit -v + ca = commit --amend + caa = commit --amend -C HEAD + cl = clone --recursive + co = checkout + cop = checkout -p + d = diff + f = fetch --all + g = grep --break --heading + m = merge --ff-only + nb = !git create-new-branch + p = push + rb = rebase + rba = rebase --abort + rbc = rebase --continue + rbi = rebase --interactive + s = status + sb = show-branch -a + dt = difftool unmerged = branch --no-merged unmerged-remote = branch --remote --no-merged [branch] - autosetupmerge = true - autosetuprebase = always + autosetupmerge = true + autosetuprebase = always [color] - branch = auto - diff = auto - status = auto - ui = true + branch = auto + diff = auto + status = auto + ui = true [color "branch"] - current = red reverse - local = blue - remote = green + current = red reverse + local = blue + remote = green [color "diff"] - meta = yellow - frag = magenta - old = red bold - new = green - plain = white + meta = yellow + frag = magenta + old = red bold + new = green + plain = white [color "status"] - added = yellow - changed = green - untracked = cyan + added = yellow + changed = green + untracked = cyan [commit] - verbose = true + verbose = true [core] - # A global .gitignore file. - excludesFile = ~/.gitignore-global + # A global .gitignore file. + excludesFile = ~/.gitignore-global [diff] - tool = vimdiff + tool = vimdiff [fetch] - # Always prune when fetching (and pulling). - prune = true + # Always prune when fetching (and pulling). + prune = true [gitsh] - nogreeting = true + nogreeting = true [grep] - # Show the line numbers in the output. - lineNumber = true + # Show the line numbers in the output. + lineNumber = true [help] - autocorrect = 1 + autocorrect = 1 [include] - path = ~/.gitconfig-local + path = ~/.gitconfig-local [rebase] - autosquash = true - autostash = true + autosquash = true + autostash = true [rerere] - # Store and re-use manual conflict resolution changes. - enabled = true + # Store and re-use manual conflict resolution changes. + enabled = true [push] - # Push the current branch to update a branch with the same name on the - # receiving end. - default = current + # Push the current branch to update a branch with the same name on the + # receiving end. + default = current [url "https://github.com/"] - insteadOf = gh: + insteadOf = gh: [url "https://gist.github.com/"] - insteadOf = gist: + insteadOf = gist: [url "https://bitbucket.org/"] - insteadOf = bb: + insteadOf = bb: [url "https://git.drupal.org/project/"] - # Clone from drupal.org using "git clone do:{name}" - # or "git clone drupal:{name}". - insteadOf = do: - insteadOf = drupal: + # Clone from drupal.org using "git clone do:{name}" + # or "git clone drupal:{name}". + insteadOf = do: + insteadOf = drupal: [pull] - rebase = true ff = only + rebase = true [merge] - defaultToUpstream = true + defaultToUpstream = true ff = false