From 23c21f5a207b9f0736e733c92d8bfd14518e0df1 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 5 May 2016 08:07:16 +0100 Subject: [PATCH] Update aliases --- .gitconfig | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.gitconfig b/.gitconfig index 34e700b..fcbb3ca 100644 --- a/.gitconfig +++ b/.gitconfig @@ -14,8 +14,6 @@ create-new-branch = checkout -b # Add a commit that fixes another (to be used with `rebase -i`). fixup = commit --fixup - ll = log --oneline --stat - ls = log --oneline --decorate noff = merge --no-ff rebase-my-fork = !git fetch upstream && git rebase upstream/master remotes = remote -v @@ -24,8 +22,8 @@ unstage = reset HEAD -- wipe = clean -fd word-diff = diff --word-diff - ls = log --oneline --decorate - ll = log --oneline --stat + ls = log --oneline --decorate -20 + ll = log --oneline --stat -10 # Print the name of the current branch. current-branch = symbolic-ref --short HEAD @@ -79,7 +77,6 @@ d = diff f = fetch --all g = grep --break --heading - l = !git log --oneline --graph --decorate --all -20 || true m = merge --ff-only nb = !git create-new-branch p = push