diff --git a/README.md b/README.md index 587cc2a938d..53c02478e57 100644 --- a/README.md +++ b/README.md @@ -141,9 +141,9 @@ Press space on the selected line to stage it, or press `v` to start selecting a ### Interactive Rebase -Press `i` to start an interactive rebase. Then squash (`s`), fixup (`f`), drop (`d`), edit (`e`), move up (`ctrl+k`) or move down (`ctrl+j`) any of TODO commits, before continuing the rebase by bringing up the rebase options menu with `m` and then selecting `continue`. +Press `i` to start an interactive rebase. Then squash (`s`), fixup (`f`), drop (`d`), edit (`e`), move up (`ctrl+k`) or move down (`ctrl+j`) any of the TODO commits, before continuing the rebase by bringing up the rebase options menu with `m` and then selecting `continue`. -You can also perform any these actions as a once-off (e.g. pressing `s` on a commit to squash it) without explicitly starting a rebase. +You can also perform any of these actions as a once-off (e.g. pressing `s` on a commit to squash it) without explicitly starting a rebase. This demo also uses shift+down to select a range of commits to move and fixup. diff --git a/docs-master/Custom_Pagers.md b/docs-master/Custom_Pagers.md index 83f4e4e6226..903928d46b0 100644 --- a/docs-master/Custom_Pagers.md +++ b/docs-master/Custom_Pagers.md @@ -6,7 +6,7 @@ Support does not extend to Windows users, because we're making use of a package Multiple pagers are supported; you can cycle through them with the `|` key. This can be useful if you usually prefer a particular pager, but want to use a different one for certain kinds of diffs. -Pagers are configured with the `pagers` array in the git section; here's an example for a multi-pager setup: +Pagers are configured with the `pagers` array in the git section; here's an example for a multi-pager setup (use an empty object `{}` for the default builtin diff display that doesn't use a pager): ```yaml git: @@ -15,6 +15,7 @@ git: - pager: ydiff -p cat -s --wrap --width={{columnWidth}} colorArg: never - externalDiffCommand: difft --color=always + - {} # default, no pager used ``` The `colorArg` key is for whether you want the `--color=always` arg in your `git diff` command. Some pagers want it set to `always`, others want it set to `never`. The default is `always`, since that's what most pagers need. diff --git a/docs/Custom_Pagers.md b/docs/Custom_Pagers.md index 83f4e4e6226..903928d46b0 100644 --- a/docs/Custom_Pagers.md +++ b/docs/Custom_Pagers.md @@ -6,7 +6,7 @@ Support does not extend to Windows users, because we're making use of a package Multiple pagers are supported; you can cycle through them with the `|` key. This can be useful if you usually prefer a particular pager, but want to use a different one for certain kinds of diffs. -Pagers are configured with the `pagers` array in the git section; here's an example for a multi-pager setup: +Pagers are configured with the `pagers` array in the git section; here's an example for a multi-pager setup (use an empty object `{}` for the default builtin diff display that doesn't use a pager): ```yaml git: @@ -15,6 +15,7 @@ git: - pager: ydiff -p cat -s --wrap --width={{columnWidth}} colorArg: never - externalDiffCommand: difft --color=always + - {} # default, no pager used ``` The `colorArg` key is for whether you want the `--color=always` arg in your `git diff` command. Some pagers want it set to `always`, others want it set to `never`. The default is `always`, since that's what most pagers need.