From 8e6914e092e652579ffc16b9721886ce6dfd8ded Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Thu, 27 Sep 2018 13:54:06 +0200
Subject: git: enable pending with GitHub squash-merges

---
 git/.config/git/config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'git')

diff --git a/git/.config/git/config b/git/.config/git/config
index d1b2bb2..a0aa5a6 100644
--- a/git/.config/git/config
+++ b/git/.config/git/config
@@ -18,7 +18,7 @@
 	co = checkout
 	ready = rebase -i @{u}
 	lasttag = "!sh -c 'git tag --sort=version:refname | grep \"^v\\?[0-9]\" | tail -n1'"
-	pending = "!sh -c 'git log --oneline --merges --grep=\"Merge pull request\" ...$(git lasttag)'"
+	pending = "!sh -c 'git log --oneline --grep=\"#[0-9]\" ...$(git lasttag)'"
 	lg = log --pretty=format:'%Cred%h%Creset -%Creset %s %Cgreen(%cr) %C(bold blue)<%an> %Cred%d%Creset'
 	ignored = ls-files --others -i --exclude-standard
 	bump = !bmpr
-- 
cgit 1.4.1