Fossil SCM
Fixed irregular indents in gitusers.md command examples
Commit
d1ebc8ef061d023a670448c971ffac077ebd62c3533fbc4c83c7a40cef3fdcde
Parent
7e907a1d010c69d…
1 file changed
+14
-14
+14
-14
| --- www/gitusers.md | ||
| +++ www/gitusers.md | ||
| @@ -68,17 +68,17 @@ | ||
| 68 | 68 | |
| 69 | 69 | git checkout some-branch |
| 70 | 70 | |
| 71 | 71 | …is spelled: |
| 72 | 72 | |
| 73 | - fossil update some-branch | |
| 73 | + fossil update some-branch | |
| 74 | 74 | |
| 75 | 75 | …in Fossil. |
| 76 | 76 | |
| 77 | 77 | Second, as of Fossil 2.14, we now have Git-style clone-and-open: |
| 78 | 78 | |
| 79 | - fossil clone https://example.com/repo | |
| 79 | + fossil clone https://example.com/repo | |
| 80 | 80 | |
| 81 | 81 | That gets you a `repo.fossil` file, opened into a `repo/` working |
| 82 | 82 | directory alongside it. Note that we do not commingle the repo and |
| 83 | 83 | working directory even in this case. See [the workflows doc][ckwf] |
| 84 | 84 | for more detail on this and related topics. |
| @@ -187,12 +187,12 @@ | ||
| 187 | 187 | git worktree add ../foo-branch foo-branch |
| 188 | 188 | cd ../foo-branch |
| 189 | 189 | |
| 190 | 190 | That is approximately equivalent to this in Fossil: |
| 191 | 191 | |
| 192 | - mkdir ../foo-branch | |
| 193 | - fossil open /path/to/repo.fossil foo-branch | |
| 192 | + mkdir ../foo-branch | |
| 193 | + fossil open /path/to/repo.fossil foo-branch | |
| 194 | 194 | |
| 195 | 195 | That then leads us to the closest equivalent in Git to [closing a Fossil |
| 196 | 196 | check-out](#close): |
| 197 | 197 | |
| 198 | 198 | git worktree remove . |
| @@ -202,11 +202,11 @@ | ||
| 202 | 202 | the checked-out files! Fossil’s alternative is shorter, easier to |
| 203 | 203 | remember, and safer. |
| 204 | 204 | |
| 205 | 205 | There’s another way to get Fossil-like separate worktrees in Git: |
| 206 | 206 | |
| 207 | - git clone --separate-git-dir repo.git https://example.com/repo | |
| 207 | + git clone --separate-git-dir repo.git https://example.com/repo | |
| 208 | 208 | |
| 209 | 209 | This allows you to have your Git repository directory entirely separate |
| 210 | 210 | from your working tree, with `.git` in the check-out directory being a |
| 211 | 211 | file that points to `../repo.git`, in this example. |
| 212 | 212 | |
| @@ -362,28 +362,28 @@ | ||
| 362 | 362 | ## Create Branches At Point Of Need, Rather Than Ahead of Need |
| 363 | 363 | |
| 364 | 364 | Fossil prefers that you create new branches as part of the first commit |
| 365 | 365 | on that branch: |
| 366 | 366 | |
| 367 | - fossil commit --branch my-new-branch | |
| 367 | + fossil commit --branch my-new-branch | |
| 368 | 368 | |
| 369 | 369 | If that commit is successful, your local check-out directory is then |
| 370 | 370 | switched to the tip of that branch, so subsequent commits don’t need the |
| 371 | 371 | “`--branch`” option. You simply say `fossil commit` again to continue |
| 372 | 372 | adding commits to the tip of that branch. |
| 373 | 373 | |
| 374 | 374 | To switch back to the parent branch, say something like: |
| 375 | 375 | |
| 376 | - fossil update trunk # ≅ git checkout master | |
| 376 | + fossil update trunk # ≅ git checkout master | |
| 377 | 377 | |
| 378 | 378 | Fossil does also support the Git style, creating the branch ahead of |
| 379 | 379 | need: |
| 380 | 380 | |
| 381 | - fossil branch new my-new-branch | |
| 382 | - fossil update my-new-branch | |
| 383 | - ...work on first commit... | |
| 384 | - fossil commit | |
| 381 | + fossil branch new my-new-branch | |
| 382 | + fossil update my-new-branch | |
| 383 | + ...work on first commit... | |
| 384 | + fossil commit | |
| 385 | 385 | |
| 386 | 386 | This is more verbose, but it has the same effect: put the first commit |
| 387 | 387 | onto `my-new-branch` and switch the check-out directory to that branch so |
| 388 | 388 | subsequent commits are descendants of that initial branch commit. |
| 389 | 389 | |
| @@ -574,11 +574,11 @@ | ||
| 574 | 574 | |
| 575 | 575 | Fossil doesn’t have an internal equivalent to commands like |
| 576 | 576 | `git show --stat`, but it’s easily remedied by using |
| 577 | 577 | [the widely-available `diffstat` tool][dst]: |
| 578 | 578 | |
| 579 | - fossil diff -i --from 2020-04-01 | diffstat | |
| 579 | + fossil diff -i --from 2020-04-01 | diffstat | |
| 580 | 580 | |
| 581 | 581 | We gave the `-i` flag here to force Fossil to use its internal diff |
| 582 | 582 | implementation, bypassing [your local `diff-command` setting][dcset]. |
| 583 | 583 | If you had that set to [`colordiff`][cdiff], for example, its output |
| 584 | 584 | would confuse `diffstat`. |
| @@ -661,19 +661,19 @@ | ||
| 661 | 661 | default: they do not actually rename or delete the files in your |
| 662 | 662 | check-out. |
| 663 | 663 | |
| 664 | 664 | If you don’t like that default, you can change it globally: |
| 665 | 665 | |
| 666 | - fossil setting --global mv-rm-files 1 | |
| 666 | + fossil setting --global mv-rm-files 1 | |
| 667 | 667 | |
| 668 | 668 | Now these commands behave like in Git in any Fossil repository where |
| 669 | 669 | this setting hasn’t been overridden locally. |
| 670 | 670 | |
| 671 | 671 | If you want to keep Fossil’s soft `mv/rm` behavior most of the time, you |
| 672 | 672 | can cast it away on a per-command basis: |
| 673 | 673 | |
| 674 | - fossil mv --hard old-name new-name | |
| 674 | + fossil mv --hard old-name new-name | |
| 675 | 675 | |
| 676 | 676 | [mv]: /help?cmd=mv |
| 677 | 677 | [rm]: /help?cmd=rm |
| 678 | 678 | |
| 679 | 679 | |
| 680 | 680 |
| --- www/gitusers.md | |
| +++ www/gitusers.md | |
| @@ -68,17 +68,17 @@ | |
| 68 | |
| 69 | git checkout some-branch |
| 70 | |
| 71 | …is spelled: |
| 72 | |
| 73 | fossil update some-branch |
| 74 | |
| 75 | …in Fossil. |
| 76 | |
| 77 | Second, as of Fossil 2.14, we now have Git-style clone-and-open: |
| 78 | |
| 79 | fossil clone https://example.com/repo |
| 80 | |
| 81 | That gets you a `repo.fossil` file, opened into a `repo/` working |
| 82 | directory alongside it. Note that we do not commingle the repo and |
| 83 | working directory even in this case. See [the workflows doc][ckwf] |
| 84 | for more detail on this and related topics. |
| @@ -187,12 +187,12 @@ | |
| 187 | git worktree add ../foo-branch foo-branch |
| 188 | cd ../foo-branch |
| 189 | |
| 190 | That is approximately equivalent to this in Fossil: |
| 191 | |
| 192 | mkdir ../foo-branch |
| 193 | fossil open /path/to/repo.fossil foo-branch |
| 194 | |
| 195 | That then leads us to the closest equivalent in Git to [closing a Fossil |
| 196 | check-out](#close): |
| 197 | |
| 198 | git worktree remove . |
| @@ -202,11 +202,11 @@ | |
| 202 | the checked-out files! Fossil’s alternative is shorter, easier to |
| 203 | remember, and safer. |
| 204 | |
| 205 | There’s another way to get Fossil-like separate worktrees in Git: |
| 206 | |
| 207 | git clone --separate-git-dir repo.git https://example.com/repo |
| 208 | |
| 209 | This allows you to have your Git repository directory entirely separate |
| 210 | from your working tree, with `.git` in the check-out directory being a |
| 211 | file that points to `../repo.git`, in this example. |
| 212 | |
| @@ -362,28 +362,28 @@ | |
| 362 | ## Create Branches At Point Of Need, Rather Than Ahead of Need |
| 363 | |
| 364 | Fossil prefers that you create new branches as part of the first commit |
| 365 | on that branch: |
| 366 | |
| 367 | fossil commit --branch my-new-branch |
| 368 | |
| 369 | If that commit is successful, your local check-out directory is then |
| 370 | switched to the tip of that branch, so subsequent commits don’t need the |
| 371 | “`--branch`” option. You simply say `fossil commit` again to continue |
| 372 | adding commits to the tip of that branch. |
| 373 | |
| 374 | To switch back to the parent branch, say something like: |
| 375 | |
| 376 | fossil update trunk # ≅ git checkout master |
| 377 | |
| 378 | Fossil does also support the Git style, creating the branch ahead of |
| 379 | need: |
| 380 | |
| 381 | fossil branch new my-new-branch |
| 382 | fossil update my-new-branch |
| 383 | ...work on first commit... |
| 384 | fossil commit |
| 385 | |
| 386 | This is more verbose, but it has the same effect: put the first commit |
| 387 | onto `my-new-branch` and switch the check-out directory to that branch so |
| 388 | subsequent commits are descendants of that initial branch commit. |
| 389 | |
| @@ -574,11 +574,11 @@ | |
| 574 | |
| 575 | Fossil doesn’t have an internal equivalent to commands like |
| 576 | `git show --stat`, but it’s easily remedied by using |
| 577 | [the widely-available `diffstat` tool][dst]: |
| 578 | |
| 579 | fossil diff -i --from 2020-04-01 | diffstat |
| 580 | |
| 581 | We gave the `-i` flag here to force Fossil to use its internal diff |
| 582 | implementation, bypassing [your local `diff-command` setting][dcset]. |
| 583 | If you had that set to [`colordiff`][cdiff], for example, its output |
| 584 | would confuse `diffstat`. |
| @@ -661,19 +661,19 @@ | |
| 661 | default: they do not actually rename or delete the files in your |
| 662 | check-out. |
| 663 | |
| 664 | If you don’t like that default, you can change it globally: |
| 665 | |
| 666 | fossil setting --global mv-rm-files 1 |
| 667 | |
| 668 | Now these commands behave like in Git in any Fossil repository where |
| 669 | this setting hasn’t been overridden locally. |
| 670 | |
| 671 | If you want to keep Fossil’s soft `mv/rm` behavior most of the time, you |
| 672 | can cast it away on a per-command basis: |
| 673 | |
| 674 | fossil mv --hard old-name new-name |
| 675 | |
| 676 | [mv]: /help?cmd=mv |
| 677 | [rm]: /help?cmd=rm |
| 678 | |
| 679 | |
| 680 |
| --- www/gitusers.md | |
| +++ www/gitusers.md | |
| @@ -68,17 +68,17 @@ | |
| 68 | |
| 69 | git checkout some-branch |
| 70 | |
| 71 | …is spelled: |
| 72 | |
| 73 | fossil update some-branch |
| 74 | |
| 75 | …in Fossil. |
| 76 | |
| 77 | Second, as of Fossil 2.14, we now have Git-style clone-and-open: |
| 78 | |
| 79 | fossil clone https://example.com/repo |
| 80 | |
| 81 | That gets you a `repo.fossil` file, opened into a `repo/` working |
| 82 | directory alongside it. Note that we do not commingle the repo and |
| 83 | working directory even in this case. See [the workflows doc][ckwf] |
| 84 | for more detail on this and related topics. |
| @@ -187,12 +187,12 @@ | |
| 187 | git worktree add ../foo-branch foo-branch |
| 188 | cd ../foo-branch |
| 189 | |
| 190 | That is approximately equivalent to this in Fossil: |
| 191 | |
| 192 | mkdir ../foo-branch |
| 193 | fossil open /path/to/repo.fossil foo-branch |
| 194 | |
| 195 | That then leads us to the closest equivalent in Git to [closing a Fossil |
| 196 | check-out](#close): |
| 197 | |
| 198 | git worktree remove . |
| @@ -202,11 +202,11 @@ | |
| 202 | the checked-out files! Fossil’s alternative is shorter, easier to |
| 203 | remember, and safer. |
| 204 | |
| 205 | There’s another way to get Fossil-like separate worktrees in Git: |
| 206 | |
| 207 | git clone --separate-git-dir repo.git https://example.com/repo |
| 208 | |
| 209 | This allows you to have your Git repository directory entirely separate |
| 210 | from your working tree, with `.git` in the check-out directory being a |
| 211 | file that points to `../repo.git`, in this example. |
| 212 | |
| @@ -362,28 +362,28 @@ | |
| 362 | ## Create Branches At Point Of Need, Rather Than Ahead of Need |
| 363 | |
| 364 | Fossil prefers that you create new branches as part of the first commit |
| 365 | on that branch: |
| 366 | |
| 367 | fossil commit --branch my-new-branch |
| 368 | |
| 369 | If that commit is successful, your local check-out directory is then |
| 370 | switched to the tip of that branch, so subsequent commits don’t need the |
| 371 | “`--branch`” option. You simply say `fossil commit` again to continue |
| 372 | adding commits to the tip of that branch. |
| 373 | |
| 374 | To switch back to the parent branch, say something like: |
| 375 | |
| 376 | fossil update trunk # ≅ git checkout master |
| 377 | |
| 378 | Fossil does also support the Git style, creating the branch ahead of |
| 379 | need: |
| 380 | |
| 381 | fossil branch new my-new-branch |
| 382 | fossil update my-new-branch |
| 383 | ...work on first commit... |
| 384 | fossil commit |
| 385 | |
| 386 | This is more verbose, but it has the same effect: put the first commit |
| 387 | onto `my-new-branch` and switch the check-out directory to that branch so |
| 388 | subsequent commits are descendants of that initial branch commit. |
| 389 | |
| @@ -574,11 +574,11 @@ | |
| 574 | |
| 575 | Fossil doesn’t have an internal equivalent to commands like |
| 576 | `git show --stat`, but it’s easily remedied by using |
| 577 | [the widely-available `diffstat` tool][dst]: |
| 578 | |
| 579 | fossil diff -i --from 2020-04-01 | diffstat |
| 580 | |
| 581 | We gave the `-i` flag here to force Fossil to use its internal diff |
| 582 | implementation, bypassing [your local `diff-command` setting][dcset]. |
| 583 | If you had that set to [`colordiff`][cdiff], for example, its output |
| 584 | would confuse `diffstat`. |
| @@ -661,19 +661,19 @@ | |
| 661 | default: they do not actually rename or delete the files in your |
| 662 | check-out. |
| 663 | |
| 664 | If you don’t like that default, you can change it globally: |
| 665 | |
| 666 | fossil setting --global mv-rm-files 1 |
| 667 | |
| 668 | Now these commands behave like in Git in any Fossil repository where |
| 669 | this setting hasn’t been overridden locally. |
| 670 | |
| 671 | If you want to keep Fossil’s soft `mv/rm` behavior most of the time, you |
| 672 | can cast it away on a per-command basis: |
| 673 | |
| 674 | fossil mv --hard old-name new-name |
| 675 | |
| 676 | [mv]: /help?cmd=mv |
| 677 | [rm]: /help?cmd=rm |
| 678 | |
| 679 | |
| 680 |