From 7f23765bb07e4eeb145a50f55c2c04f2c9e4325b Mon Sep 17 00:00:00 2001 From: Starbeamrainbowlabs Date: Mon, 19 Aug 2019 19:09:13 +0100 Subject: [PATCH 1/2] Update git-switch.md --- pages/common/git-switch.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pages/common/git-switch.md b/pages/common/git-switch.md index d0baeb3a229351..70fdb4634ec768 100644 --- a/pages/common/git-switch.md +++ b/pages/common/git-switch.md @@ -12,14 +12,14 @@ `git switch --create {{branch_name}}` -- Create a new branch based on an existing commit: +- Create a new branch based on an existing commit and switch to it: `git switch --create {{branch_name}} {{commit}}` -- Update all submodules to match the target branch: +- Switch to a branch and update all submodules to match the target branch: `git switch --recurse-submodules {{branch_name}}` -- Automatically merge the current branch and any uncommitted changes into the new branch: +- Switch to a branch and automatically merge the current branch and any uncommitted changes into it: `git switch --merge {{branch_name}}` From 12edc307240876cf00780cc407b0d097cae7ec2f Mon Sep 17 00:00:00 2001 From: Starbeamrainbowlabs Date: Tue, 20 Aug 2019 21:35:37 +0100 Subject: [PATCH 2/2] Update git-switch.md --- pages/common/git-switch.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/common/git-switch.md b/pages/common/git-switch.md index 70fdb4634ec768..ff29c11a1ecff5 100644 --- a/pages/common/git-switch.md +++ b/pages/common/git-switch.md @@ -16,7 +16,7 @@ `git switch --create {{branch_name}} {{commit}}` -- Switch to a branch and update all submodules to match the target branch: +- Switch to a branch and update all submodules to match: `git switch --recurse-submodules {{branch_name}}`