| Index: docs/shift_based_development.md
|
| diff --git a/docs/shift_based_development.md b/docs/shift_based_development.md
|
| index 3d8f6454367745cc95018469c379558b2cfa1cd7..ffc62c952c5528dc06ed7451fdeaf047b7502789 100644
|
| --- a/docs/shift_based_development.md
|
| +++ b/docs/shift_based_development.md
|
| @@ -58,9 +58,7 @@ done in your separate local repositories, and you still use e.g. git
|
| pull (which in our git svn repositories behind the scenes does a `git svn fetch` etc.
|
|
|
| Shift-based collaboration won't work well (at least not with a
|
| -pipeline of branches) unless you are using an "unmanaged" git checkout
|
| -(search for "unmanaged" on
|
| -[this page](https://code.google.com/p/chromium/wiki/UsingNewGit)).
|
| +pipeline of branches) unless you are using an "unmanaged" git checkout.
|
|
|
| ## Example Working Rules
|
|
|
| @@ -149,4 +147,4 @@ To push a local branch to shiftrepo: `git push shiftrepo localbranchname`
|
| To push all "matching" branches (i.e. push the latest copy of
|
| any local branch that has previously been pushed to shiftrepo): `git push shiftrepo`
|
|
|
| -To delete a branch from shiftrepo, it's weird: `git push shiftrepo :branchname`
|
| +To delete a branch from shiftrepo, it's weird: `git push shiftrepo :branchname`
|
|
|