diff options
| author | Xiao Pan <xyz@flylightning.xyz> | 2026-06-21 16:52:15 +0800 |
|---|---|---|
| committer | Xiao Pan <xyz@flylightning.xyz> | 2026-06-21 16:52:15 +0800 |
| commit | c29c35d3d73e9b1ce6f774f1649bf4f65041445b (patch) | |
| tree | bccce21fed94b6aea3b53b85a9600f906f445412 /sh/upd | |
| parent | dbf63b947a7974a34d5d6c76e5e40c77e81b7a00 (diff) | |
git pull upstream firefox-csshacks consider I forked it
Diffstat (limited to 'sh/upd')
| -rwxr-xr-x | sh/upd | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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' |
