From 85e54a0ebde00e19d7dec543356f48b99c307e0b Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Mon, 27 Jan 2020 12:47:28 +0000 Subject: [PATCH] Update Maintainer Guide --- Maintainer-Guide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Maintainer-Guide.md b/Maintainer-Guide.md index 4de5f84..c849f6f 100644 --- a/Maintainer-Guide.md +++ b/Maintainer-Guide.md @@ -14,7 +14,7 @@ The rebase consists of the following steps: 1. Rebase the kernel patches: ``git rebase ark-patches``. 2. If a patch fails to apply and the fix is clear, go ahead and fix it. Otherwise, file an [issue](https://gitlab.com/cki-project/kernel-ark/issues) for each patch that does not apply with the commit hash and conflict details so it can be resolved later. -3. If rebasing onto a tag, create a branch for this revision of the kernel patches. This is useful when comparing the state of the patches between versions: ``git branch ark/patches/``. +3. If rebasing onto a tag, create a branch for this revision of the kernel patches. This is useful when comparing the state of the patches between versions: ``git branch ark/patches/ && git push upstream ark/patches/``. 4. ``git push -f upstream ark-patches`` ### Common Problems