[lmi-commits] [lmi] master 14ff0cb 01/12: Add a note about branching

[Greg Chicares]

branch: master
commit 14ff0cbe73cf2fea81bef28ee9cf6770ab4b4ee7
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Add a note about branching
---
 gwc/develop1.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gwc/develop1.txt b/gwc/develop1.txt
index c400d8d..da8837b 100644
--- a/gwc/develop1.txt
+++ b/gwc/develop1.txt
@@ -92,6 +92,12 @@ git checkout odd/foo
 git commit sandbox_test.cpp
 git checkout master
 git push origin odd/foo
+
+  # to transplant already-pushed commits to a new branch
+git branch odd/foo
+git reset --keep origin/master
+  # ...and don't ever rebase that new branch
+
   # (to copy to a subdir before deletion, so it's in permanent history)
   # (this works only if all modified files are unique to the branch)
 git checkout master