projects / openwrt / staging / blocktrron.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 317076d) | patch
scripts/feeds: Support feed update with git pull --rebase
authorHannu Nyman <hannu.nyman@iki.fi>
Sat, 4 May 2024 06:56:32 +0000 (09:56 +0300)
committerRobert Marko <robimarko@gmail.com>
Sun, 8 Sep 2024 16:54:41 +0000 (18:54 +0200)
commitef720b1e09fc8f013dc2bcc0b86f9b98ed4607fc
tree68989d0f51a1f9d32c7f0b35e696e8dcc46aaa91tree | snapshot
parent317076d2573eb91a97675c689ff56446ba15ab52commit | diff
scripts/feeds: Support feed update with git pull --rebase

Add feed update option '-r' to perform "git pull --rebase" so that
possible local commits are rebased on top of the new commits pulled
from origin. That enables git pull while there are local
development commits.

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 diff | blob | history
Staging tree of David Bauer