Skip to content

Commit aad9c25

Browse files
committed
initial version of git icshow
1 parent 4a2670f commit aad9c25

3 files changed

Lines changed: 27 additions & 1 deletion

File tree

README.md

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff 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

9090
To see what it looks like, try:
9191

@@ -106,6 +106,23 @@ You can configure `git-icdiff` in Git's config:
106106
git 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

111128
To try it out, run:

git-icshow

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/sh
2+
3+
GIT_EXTERNAL_DIFF=icdiff-git-extdiff git show --ext-diff

icdiff-git-extdiff

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
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

0 commit comments

Comments
 (0)