mirror of
https://github.com/opnsense/core.git
synced 2026-05-28 04:34:51 -04:00
make: improve rebase to auto-abort much like mfc target
This commit is contained in:
parent
06a2025f3c
commit
45dc8a3c1f
1 changed files with 1 additions and 1 deletions
|
|
@ -99,7 +99,7 @@ ${CORE_MAINS}:
|
|||
|
||||
rebase:
|
||||
@${GIT} checkout ${CORE_STABLE}
|
||||
@${GIT} rebase -i
|
||||
@${GIT} rebase -i || ${GIT} rebase --abort
|
||||
@${GIT} checkout ${CORE_MAIN}
|
||||
|
||||
reset:
|
||||
|
|
|
|||
Loading…
Reference in a new issue