Skip to content

initial version of git icshow #231

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
juchem wants to merge 1 commit into
base: master
Choose a base branch
from
Open

initial version of git icshow #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ Show differences between files in a two column view.
'--color-map=separator:white,description:cyan
```

## Using with Git
## Using with Git Diff

To see what it looks like, try:

Expand All @@ -106,6 +106,23 @@ You can configure `git-icdiff` in Git's config:
git config --global icdiff.options '--highlight --line-numbers'
```

## Using with Git Show

To see what it looks like, try:

```sh
GIT_EXTERNAL_DIFF=path/to/icdiff-git-extdiff git show --ext-diff
```

To install this as a tool you can use with Git, copy
`git-icshow` and ``icdiff-git-extdiff into your PATH and run:

```sh
git icshow
```

It uses the same `icdiff.options` configuration used by `git-icdiff`.

## Using with subversion

To try it out, run:
Expand Down
3 changes: 3 additions & 0 deletions git-icshow
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/sh

GIT_EXTERNAL_DIFF=icdiff-git-extdiff git show --ext-diff
6 changes: 6 additions & 0 deletions icdiff-git-extdiff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/sh
set -e

ICDIFF_OPTIONS=$(git config --get icdiff.options)

sh -c "exec icdiff $ICDIFF_OPTIONS '$2' '$5'" || true