diff options
| author | Karel Kočí <cynerd@email.cz> | 2020-09-02 15:03:41 +0200 |
|---|---|---|
| committer | Karel Kočí <cynerd@email.cz> | 2020-09-02 15:03:41 +0200 |
| commit | d348447017a03d2b5c267b4b3db67fb6931ee741 (patch) | |
| tree | 29d944d5ae155ed24424146b13ac45008b7f5b47 | |
| parent | 0e16c65fd2ced7b8970747f148522f1c54b2a081 (diff) | |
| download | shellrc-d348447017a03d2b5c267b4b3db67fb6931ee741.tar.gz shellrc-d348447017a03d2b5c267b4b3db67fb6931ee741.tar.bz2 shellrc-d348447017a03d2b5c267b4b3db67fb6931ee741.zip | |
shellrc.d/git: fix gitbmerge to work with new Gitlab formatv0.7.8
| -rw-r--r-- | shellrc.d/git | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/shellrc.d/git b/shellrc.d/git index 493d89b..3cf6117 100644 --- a/shellrc.d/git +++ b/shellrc.d/git @@ -16,7 +16,7 @@ gitbmerge() ( echo "First squash fixups!" return 1 } - [ -z "$(git log --grep="^Apply suggestion to " HEAD.."$1")" ] || { + [ -z "$(git log --grep="^Apply .* suggestion(s) to " HEAD.."$1")" ] || { echo "First squash suggestions!" return 1 } |