Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'mt/dir-iterator-updates'
[gitweb.git]
/
Documentation
/
gitworkflows.txt
diff --git
a/Documentation/gitworkflows.txt
b/Documentation/gitworkflows.txt
index ca11c7bdafb91bc2f6ae71ca18a2f6b45e5f38b0..abc0dc6bc79bfaf088202114ecee1dbe1f704dc9 100644
(file)
--- a/
Documentation/gitworkflows.txt
+++ b/
Documentation/gitworkflows.txt
@@
-301,8
+301,7
@@
topics on 'next':
.Rewind and rebuild next
[caption="Recipe: "]
=====================================
-* `git checkout next`
-* `git reset --hard master`
+* `git switch -C next master`
* `git merge ai/topic_in_next1`
* `git merge ai/topic_in_next2`
* ...