From: Ian Kelling Date: Fri, 16 May 2025 01:53:30 +0000 (-0400) Subject: minor improvements X-Git-Url: https://iankelling.org/git/?a=commitdiff_plain;h=0b95c4487949e3bf8ffc279f868832a8d9016b9b;p=distro-setup minor improvements --- diff --git a/brc2 b/brc2 index 87f5451..7865d23 100644 --- a/brc2 +++ b/brc2 @@ -4839,11 +4839,17 @@ og() { gh_pr_num=$(gh pr ls --json number -q '.[].number' | tail -n1) m gh pr checkout $gh_pr_num -b $gh_pr_num m i rebase main + if ! git status | grep -qFx 'nothing to commit, working tree clean'; then + osi-github-end + fi } # continue og after fixing rebase o2() { GIT_EDITOR=true m i rebase --continue + osi-github-end +} +osi-github-end() { m i co main m i merge $gh_pr_num m osimain @@ -4851,6 +4857,7 @@ o2() { We'd much appreciate if you promote the petition further! Thanks again!" + } export BASEFILE_DIR=/a/bin/fai-basefiles diff --git a/subdir_files/.config/mpv/mpv.conf b/subdir_files/.config/mpv/mpv.conf index 3aee05d..b4487c2 100644 --- a/subdir_files/.config/mpv/mpv.conf +++ b/subdir_files/.config/mpv/mpv.conf @@ -18,6 +18,7 @@ hwdec=vdpau [l] loop-file=inf save-position-on-quit +resume-playback #no-resume-playback #no-save-position-on-quit