summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/common.nix11
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/common.nix b/lib/common.nix
index b575ca1..f81d0d6 100644
--- a/lib/common.nix
+++ b/lib/common.nix
@@ -135,10 +135,12 @@ in {
mr = lib.concatStringsSep " " [
"!git push"
"-o merge_request.create"
+ "-o merge_request.merge_when_pipeline_succeeds"
"-o merge_request.label=ReleaseUpdate::NotRequired"
"-o merge_request.assign=$USER"
- ''-o merge_request.title="$(git log -n1 --format=%s)"''
- ''-o merge_request.description="$(git log -n1 --format=%b | tr "\n" " ")"''
+ # disable these two args bc gitlab just uses the commit message anyway
+ # ''-o merge_request.title="$(git log -n1 --format=%s)"''
+ # ''-o merge_request.description="$(git log -n --format=%b)"''
];
};
extraConfig = {
@@ -419,12 +421,11 @@ in {
_gh() {
is_in_git_repo || return
- git log --date=short --format="%C(green)%C(bold)%cd %C(auto)%h%d %s (%an)" --graph --color=always --no-merges |
+ git log --date=short --format="%C(green)%C(bold)%cd %C(auto)%h%d %s (%an)" --graph --color=always |
fzf_down --ansi --no-sort --reverse --multi --exact \
--bind 'ctrl-s:toggle-sort' \
--header 'Press CTRL-S to toggle sort' \
- --preview 'grep -o "[a-f0-9]\{7,\}" <<< {} | xargs git show --color=always | head -'$LINES |
- grep -o "[a-f0-9]\{7,\}"
+ --preview 'grep -o "[a-f0-9]\{7,\}" <<< {} | xargs git show --color=always |grep -o "[a-f0-9]\{7,\}"
}
_gr() {