From b9b12ab4bcc85f2ee3d9d530297ee17febae26c2 Mon Sep 17 00:00:00 2001 From: Adityarup Laha <30696515+adityaruplaha@users.noreply.github.com> Date: Sat, 14 Apr 2018 13:07:08 +0530 Subject: [PATCH] Rebase info --- Typical-Git-Workflow.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Typical-Git-Workflow.md b/Typical-Git-Workflow.md index 883dd3f..03bf76b 100644 --- a/Typical-Git-Workflow.md +++ b/Typical-Git-Workflow.md @@ -39,6 +39,8 @@ It's appreciated if every single commit in a branch on its own compiles on all s * From your branch, rebase `upstream/master` * `git checkout new-branch-name` * `git rebase -i upstream/master` + * Replace `pick` with `fixup` in all commits addressing feedback. + * Reword, reorder, resolve, if required. * Update `origin/new-branch-name` * `git push origin new-branch-name --force` * Create the pull request on GitHub to merge `origin/new-branch-name` into `upstream/master`