From c29c35d3d73e9b1ce6f774f1649bf4f65041445b Mon Sep 17 00:00:00 2001 From: Xiao Pan Date: Sun, 21 Jun 2026 16:52:15 +0800 Subject: git pull upstream firefox-csshacks consider I forked it --- sh/upd | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sh') diff --git a/sh/upd b/sh/upd index 593d3e5..befc1d0 100755 --- a/sh/upd +++ b/sh/upd @@ -220,7 +220,8 @@ misc () { ssh pp '[ -s "$HOME/.local/share/sdcv_history" ] && cat "$HOME/.local/share/sdcv_history" && rm "$HOME/.local/share/sdcv_history"' >> "$XDG_DATA_HOME/sdcv_history" awk '!a[$0]++' "$XDG_DATA_HOME/sdcv_history" | sponge "$XDG_DATA_HOME/sdcv_history" # temperory solution before find a way of using git submodule or subtree with `cfg -l` - git -C "$HOME/.mozilla/firefox/xxxxxxxx.fly/chrome/firefox-csshacks" pull + # `git pull upstream master` to consider origin remote is my forked repo + git -C "$HOME/.mozilla/firefox/xxxxxxxx.fly/chrome/firefox-csshacks" pull upstream master || git -C "$HOME/.mozilla/firefox/xxxxxxxx.fly/chrome/firefox-csshacks" pull git -C "$XDG_DOCUMENTS_DIR/notes" commit --all -m 'update' git -C "$XDG_DOCUMENTS_DIR/notes" push git -C "$HOME/programs/reminders" commit --all -m 'update' -- cgit v1.3.1