scripts/feeds: Support feed update with git pull --rebase --autostash
authorHannu Nyman <hannu.nyman@iki.fi>
Sat, 4 May 2024 06:57:07 +0000 (09:57 +0300)
committerRobert Marko <robimarko@gmail.com>
Sun, 8 Sep 2024 16:54:42 +0000 (18:54 +0200)
commitf68dcce3bb2a5d1043db7282809ef9b197dec99a
treede0d7ce48fae8c0243cbdf446411957136276259
parentef720b1e09fc8f013dc2bcc0b86f9b98ed4607fc
scripts/feeds: Support feed update with git pull --rebase --autostash

Add feed update option '-s' that performs 'git pull --rebase --autostash':
* possible local uncommited changes are autostashed before pull,
* local commits are then rebased on top of the new commits pulled
  from origin and
* finally git does 'stash pop'.

This enables feed update while there are local development commits
and possibly also local uncommited changes.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Link: https://github.com/openwrt/openwrt/pull/15377
Signed-off-by: Robert Marko <robimarko@gmail.com>
scripts/feeds