diff --git a/src/docs/flavortext/recommendations_on_revision_control.diviner b/src/docs/flavortext/recommendations_on_revision_control.diviner index acca93ee5c..66b7bfc9d9 100644 --- a/src/docs/flavortext/recommendations_on_revision_control.diviner +++ b/src/docs/flavortext/recommendations_on_revision_control.diviner @@ -27,8 +27,8 @@ exactly one commit (in some form), not a sequence of checkpoint commits. - In SVN, this means don't ##commit## until after an idea has been completely written. All reasonable SVN workflows naturally enforce this. - In Git, this means squashing checkpoint commits as you go (with ##git commit - --amend##) or before pushing (with ##git rebase -i## or `git merge - --squash`), or having a strict policy where your master/trunk contains only + --amend##) or before pushing (with ##git rebase -i## or ##git merge + --squash##), or having a strict policy where your master/trunk contains only merge commits and each is a merge between the old master and a branch which represents a single idea. Although this preserves the checkpoint commits along the branches, you can view master alone as a series of single-idea diff --git a/src/docs/userguide/arcanist_diff.diviner b/src/docs/userguide/arcanist_diff.diviner index fcfbdf778d..1fbea61f3c 100644 --- a/src/docs/userguide/arcanist_diff.diviner +++ b/src/docs/userguide/arcanist_diff.diviner @@ -161,8 +161,8 @@ identifiers in commit messages. (You can disable this feature by disabling "Autoclose" in the Repository configuration.) If you push to an untracked repository (or `arc` can't figure out that it's -tracked), `arc land`, `arc amend` and `arc commit` will implicitly run `arc -close-revision`. +tracked), `arc land`, `arc amend` and `arc commit` will implicitly run +`arc close-revision`. = General Information = @@ -192,5 +192,5 @@ revision with: $ arc diff --create # Force "create". $ arc diff --update # Force "update". -You can figure out what `arc` believes to be in the working copy with `arc -which`. +You can figure out what `arc` believes to be in the working copy with +`arc which`.