sascha
/
difftastic
mirror of https://github.com/Wilfred/difftastic/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve syntax highlighting in Getting Started chapter

ida_star
Wilfred Hughes 2021-09-08 23:18:02 +07:00
parent 05df450601
commit 4601d3b50c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manual/src/getting_started.md
Unescape Escape View File

@ -27,7 +27,7 @@ Git [supports external diff
tools](https://git-scm.com/docs/diff-config#Documentation/diff-config.txt-diffexternal). You tools](https://git-scm.com/docs/diff-config#Documentation/diff-config.txt-diffexternal). You
can use `GIT_EXTERNAL_DIFF` for a one-off git command. can use `GIT_EXTERNAL_DIFF` for a one-off git command.
```shell ```
$ GIT_EXTERNAL_DIFF=difftastic git diff $ GIT_EXTERNAL_DIFF=difftastic git diff
$ GIT_EXTERNAL_DIFF=difftastic git log -p --ext-diff $ GIT_EXTERNAL_DIFF=difftastic git log -p --ext-diff
$ GIT_EXTERNAL_DIFF=difftastic git show e96a7241760319 --ext-diff $ GIT_EXTERNAL_DIFF=difftastic git show e96a7241760319 --ext-diff
@ -35,7 +35,7 @@ $ GIT_EXTERNAL_DIFF=difftastic git show e96a7241760319 --ext-diff
If you want to use difftastic by default, use `git config`. If you want to use difftastic by default, use `git config`.
```shell ```
# Set git configuration for the current repository. # Set git configuration for the current repository.
$ git config diff.external difftastic $ git config diff.external difftastic
@ -58,7 +58,8 @@ $ git show e96a7241760319 --ext-diff
[git difftool](https://git-scm.com/docs/git-difftool) is a git command [git difftool](https://git-scm.com/docs/git-difftool) is a git command
for viewing the current changes with a different diff tool. Add the for viewing the current changes with a different diff tool. Add the
following to your `.gitconfig` to use difftastic as your difftool. following to your `.gitconfig` to use difftastic as your difftool.
```
```ini
[diff] [diff]
tool = difftastic tool = difftastic