Skip to content

Commit 64be3de

Browse files
Merge branch 'next'
2 parents a7f8ccd + b8e6315 commit 64be3de

File tree

10 files changed

+562
-408
lines changed

10 files changed

+562
-408
lines changed

readme.md renamed to README.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
Vanilla `git diff` vs `git` and `diff-so-fancy`
99

10-
![diff-highlight vs diff-so-fancy](https://cloud.githubusercontent.com/assets/39191/13622719/7cc7c54c-e555-11e5-86c4-7045d91af041.png)
10+
![diff-highlight vs diff-so-fancy](https://user-images.githubusercontent.com/3429760/32387617-44c873da-c082-11e7-829c-6160b853adcb.png)
1111

1212
## Install
1313

@@ -24,20 +24,20 @@ git config --global core.pager "diff-so-fancy | less --tabs=4 -RFX"
2424

2525
### Improved colors for the highlighted bits
2626

27-
The default colors are not the best so we recommend the following color settings as a base.
27+
The default Git colors are not optimal. We suggest the following colors instead.
2828
```shell
2929
git config --global color.ui true
3030

31-
git config --global color.diff-highlight.oldNormal "red bold"
31+
git config --global color.diff-highlight.oldNormal "red bold"
3232
git config --global color.diff-highlight.oldHighlight "red bold 52"
33-
git config --global color.diff-highlight.newNormal "green bold"
33+
git config --global color.diff-highlight.newNormal "green bold"
3434
git config --global color.diff-highlight.newHighlight "green bold 22"
3535

36-
git config --global color.diff.meta "227"
37-
git config --global color.diff.frag "magenta bold"
38-
git config --global color.diff.commit "227 bold"
39-
git config --global color.diff.old "red bold"
40-
git config --global color.diff.new "green bold"
36+
git config --global color.diff.meta "yellow"
37+
git config --global color.diff.frag "magenta bold"
38+
git config --global color.diff.commit "yellow bold"
39+
git config --global color.diff.old "red bold"
40+
git config --global color.diff.new "green bold"
4141
git config --global color.diff.whitespace "red reverse"
4242
```
4343

@@ -73,7 +73,7 @@ git config --bool --global diff-so-fancy.useUnicodeRuler false
7373

7474
## Contributing
7575

76-
Pull requests quite welcome, along with any feedback or ideas.
76+
Pull requests are quite welcome, and should target the `next` branch. We are also looking for any feedback or ideas on how to make diff-so-fancy even better.
7777

7878
### Other documentation
7979

0 commit comments

Comments
 (0)