Fossil SCM
Small tweaks to previous.
Commit
e67c413d505071c2936bc6d8e52de50d80a87df0aff8851dfb9fb93d1e7e966f
Parent
e3cef726f2c273f…
1 file changed
+10
-3
+10
-3
| --- www/gitusers.md | ||
| +++ www/gitusers.md | ||
| @@ -314,13 +314,20 @@ | ||
| 314 | 314 | afternoon to sync up via the dev server: |
| 315 | 315 | |
| 316 | 316 | git push work master # send your changes from home up |
| 317 | 317 | git pull work master # get your coworkers’ changes |
| 318 | 318 | |
| 319 | -Because we didn’t use `--set-upstream/-u` here, we have to name the | |
| 320 | -“work” origin explicitly in these commands. (This also shows Git’s | |
| 321 | -unwillingness to sync branch names, covered elsewhere in this document.) | |
| 319 | +Alternately, we could add “`--set-upstream/-u work`” to the first | |
| 320 | +command if we were coming into work long enough to do several Git-based things, not just pop in and sync. | |
| 321 | +That would allow the second to be just “`git pull`”, but the cost is | |
| 322 | +that when returning home, you’d have to manually reset the upstream | |
| 323 | +again. | |
| 324 | + | |
| 325 | +This example also shows a consequence of that fact that | |
| 326 | +[Git doesn’t sync branch names](#syncall): you have to keep repeating | |
| 327 | +yourself, “master, master.” | |
| 328 | + | |
| 322 | 329 | |
| 323 | 330 | ### Fossil Method |
| 324 | 331 | |
| 325 | 332 | Now we’re going to do the same thing as above using Fossil. We’ve broken |
| 326 | 333 | the commands up into blocks corresponding to those above for comparison. |
| 327 | 334 |
| --- www/gitusers.md | |
| +++ www/gitusers.md | |
| @@ -314,13 +314,20 @@ | |
| 314 | afternoon to sync up via the dev server: |
| 315 | |
| 316 | git push work master # send your changes from home up |
| 317 | git pull work master # get your coworkers’ changes |
| 318 | |
| 319 | Because we didn’t use `--set-upstream/-u` here, we have to name the |
| 320 | “work” origin explicitly in these commands. (This also shows Git’s |
| 321 | unwillingness to sync branch names, covered elsewhere in this document.) |
| 322 | |
| 323 | ### Fossil Method |
| 324 | |
| 325 | Now we’re going to do the same thing as above using Fossil. We’ve broken |
| 326 | the commands up into blocks corresponding to those above for comparison. |
| 327 |
| --- www/gitusers.md | |
| +++ www/gitusers.md | |
| @@ -314,13 +314,20 @@ | |
| 314 | afternoon to sync up via the dev server: |
| 315 | |
| 316 | git push work master # send your changes from home up |
| 317 | git pull work master # get your coworkers’ changes |
| 318 | |
| 319 | Alternately, we could add “`--set-upstream/-u work`” to the first |
| 320 | command if we were coming into work long enough to do several Git-based things, not just pop in and sync. |
| 321 | That would allow the second to be just “`git pull`”, but the cost is |
| 322 | that when returning home, you’d have to manually reset the upstream |
| 323 | again. |
| 324 | |
| 325 | This example also shows a consequence of that fact that |
| 326 | [Git doesn’t sync branch names](#syncall): you have to keep repeating |
| 327 | yourself, “master, master.” |
| 328 | |
| 329 | |
| 330 | ### Fossil Method |
| 331 | |
| 332 | Now we’re going to do the same thing as above using Fossil. We’ve broken |
| 333 | the commands up into blocks corresponding to those above for comparison. |
| 334 |