From 19cbcd7bb56674b6192a14221f76b758d85329a3 Mon Sep 17 00:00:00 2001 From: Johannes Löthberg Date: Fri, 10 Jul 2015 17:53:25 +0200 Subject: git: Add shortdesc alias MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Johannes Löthberg --- git/config | 1 + 1 file changed, 1 insertion(+) (limited to 'git/config') diff --git a/git/config b/git/config index 8507372..936f997 100644 --- a/git/config +++ b/git/config @@ -34,6 +34,7 @@ wdiff = diff --word-diff wshow = show --word-diff fpush = push --force-with-lease + shortdesc = !git --no-pager log -1 --pretty='tformat:%h (%s, %ad)' --date=short [advice] detachedHead = false -- cgit v1.2.3-54-g00ecf From 48c371b9e536917794d24b79221d40ff78ab04a1 Mon Sep 17 00:00:00 2001 From: Johannes Löthberg Date: Fri, 10 Jul 2015 17:54:35 +0200 Subject: git: enable rerere MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Johannes Löthberg --- git/config | 2 ++ 1 file changed, 2 insertions(+) (limited to 'git/config') diff --git a/git/config b/git/config index 936f997..bbf3957 100644 --- a/git/config +++ b/git/config @@ -123,3 +123,5 @@ [credential "https://github.com"] username = kyrias helper = pass +[rerere] + enabled = true -- cgit v1.2.3-54-g00ecf From fae4798017cb0460083fba63fa285cecda5eb6be Mon Sep 17 00:00:00 2001 From: Johannes Löthberg Date: Mon, 13 Jul 2015 23:17:37 +0200 Subject: git: Drop rec alias MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Johannes Löthberg --- git/config | 1 - 1 file changed, 1 deletion(-) (limited to 'git/config') diff --git a/git/config b/git/config index bbf3957..b9be8fe 100644 --- a/git/config +++ b/git/config @@ -21,7 +21,6 @@ rbc = rebase --continue rbs = rebase -i re = rebase - rec = rebase --continue st = status stat = diff --stat statc = diff --cached --stat -- cgit v1.2.3-54-g00ecf From 803619c79c18d107a7c004ddb32e02cc129523f6 Mon Sep 17 00:00:00 2001 From: Johannes Löthberg Date: Mon, 13 Jul 2015 23:17:52 +0200 Subject: git: add lol alias MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Johannes Löthberg --- git/config | 1 + 1 file changed, 1 insertion(+) (limited to 'git/config') diff --git a/git/config b/git/config index b9be8fe..b3d486a 100644 --- a/git/config +++ b/git/config @@ -14,6 +14,7 @@ follow = log --oneline --follow --stat --summary -- last = log -1 HEAD lg = log --oneline --decorate + lol = log --oneline --graph --decorate --all mend = commit --amend --reuse-message HEAD mrproper = !git reset --hard HEAD && git clean -fdx ours = !git checkout --ours $@ -- cgit v1.2.3-54-g00ecf From 9a84c77656bf16d71d1057caaa597c86bda092ed Mon Sep 17 00:00:00 2001 From: Johannes Löthberg Date: Thu, 6 Aug 2015 13:08:36 +0200 Subject: git: Add --signoff to ci alias MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Johannes Löthberg --- git/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'git/config') diff --git a/git/config b/git/config index b3d486a..bd33940 100644 --- a/git/config +++ b/git/config @@ -6,7 +6,7 @@ [alias] amend = commit --amend --verbose br = branch - ci = commit --verbose + ci = commit --verbose --signoff co = checkout di = diff dc = diff --cached -- cgit v1.2.3-54-g00ecf