diff options
author | lassulus <lassulus@lassul.us> | 2022-01-09 18:03:04 +0100 |
---|---|---|
committer | lassulus <lassulus@lassul.us> | 2022-01-09 18:03:04 +0100 |
commit | 66bcb802f5a4fe9dac92b0387ba3ad5a2915a173 (patch) | |
tree | 3ff4d6dac5303f1177fe8c958c17d27c9e40f336 /krebs/5pkgs/simple | |
parent | 42906bb7793312544fae6d485f1c9c9d426be014 (diff) | |
parent | 16aad34f14755faa6657cbb8d8dbb95cacccee39 (diff) |
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'krebs/5pkgs/simple')
-rw-r--r-- | krebs/5pkgs/simple/git-hooks/default.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/krebs/5pkgs/simple/git-hooks/default.nix b/krebs/5pkgs/simple/git-hooks/default.nix index 00a593be3..c9dcc7541 100644 --- a/krebs/5pkgs/simple/git-hooks/default.nix +++ b/krebs/5pkgs/simple/git-hooks/default.nix @@ -100,6 +100,7 @@ with stockholm.lib; add_message "$( git log \ --format="$(orange %h) %s $(gray '(%ar)')" \ + --no-merges \ --reverse \ $id2..$id |