diff options
| author | Alan Pearce | 2018-09-27 13:54:06 +0200 |
|---|---|---|
| committer | Alan Pearce | 2018-09-27 13:54:06 +0200 |
| commit | 8e6914e092e652579ffc16b9721886ce6dfd8ded (patch) | |
| tree | 7a61716cfa587cef76e1ada3986bffdfda60e16d | |
| parent | 3cadfd775b165fb3ecfd85809db793e79e8b3347 (diff) | |
| download | dotfiles-8e6914e092e652579ffc16b9721886ce6dfd8ded.tar.lz dotfiles-8e6914e092e652579ffc16b9721886ce6dfd8ded.tar.zst dotfiles-8e6914e092e652579ffc16b9721886ce6dfd8ded.zip | |
git: enable pending with GitHub squash-merges
| -rw-r--r-- | git/.config/git/config | 2 |
1 files changed, 1 insertions, 1 deletions
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 |