From 7bf132a0d4011161d5ab827b3b543401452915cf Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Wed, 6 Mar 2019 16:01:12 +0100 Subject: [PATCH] update README with rebase command --- README | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/README b/README index 4360c50..5626f1e 100644 --- a/README +++ b/README @@ -33,6 +33,15 @@ issues.:: git redmine project set myproject-id +rebase +...... + +Checkout master, pull origin/master on master then rebase current feature +branch on master, if it fails it reset the branch. Checkout the original branch +after all this. + + git redmine rebase + issue new ......... @@ -65,8 +74,9 @@ Show informations about issue 9999.:: issue submit ............ -Use `git format-patch` to create the patch serie from `master` and attach it to -the current issue. An editor is launched to add a commment.:: +It first does a `git redmine rebase` then use `git format-patch` to create the +patch serie from `master` and attach it to the current issue. An editor is +launched to add a commment.:: git redmine issue submit @@ -98,3 +108,4 @@ that those operations pass: pull-rebase the target branch, rebase feature branch on target. git rebase merge-and-push +