File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -85,7 +85,7 @@ Show differences between files in a two column view.
8585 '--color-map=separator:white,description:cyan
8686```
8787
88- ## Using with Git
88+ ## Using with Git Diff
8989
9090To see what it looks like, try:
9191
@@ -106,6 +106,23 @@ You can configure `git-icdiff` in Git's config:
106106git config --global icdiff.options '--highlight --line-numbers'
107107```
108108
109+ ## Using with Git Show
110+
111+ To see what it looks like, try:
112+
113+ ``` sh
114+ GIT_EXTERNAL_DIFF=path/to/icdiff-git-extdiff git show --ext-diff
115+ ```
116+
117+ To install this as a tool you can use with Git, copy
118+ ` git-icshow ` and ``icdiff-git-extdiff into your PATH and run:
119+
120+ ``` sh
121+ git icshow
122+ ```
123+
124+ It uses the same ` icdiff.options ` configuration used by ` git-icdiff ` .
125+
109126## Using with subversion
110127
111128To try it out, run:
Original file line number Diff line number Diff line change 1+ #! /bin/sh
2+
3+ GIT_EXTERNAL_DIFF=icdiff-git-extdiff git show --ext-diff
Original file line number Diff line number Diff line change 1+ #! /bin/sh
2+ set -e
3+
4+ ICDIFF_OPTIONS=$( git config --get icdiff.options)
5+
6+ sh -c " exec icdiff $ICDIFF_OPTIONS '$2 ' '$5 '" || true
You can’t perform that action at this time.
0 commit comments