Pretty side-by-side diff
Project description
# pdiff
Pretty side-by-side diff.
Inspired by [`cdiff`](https://github.com/ymattw/cdiff) and
[`icdiff`](https://github.com/jeffkaufman/icdiff).
## Installation
pip install pdiff
## Usage
```
usage: pdiff [<options>] [--] <old-file> <new-file>
Pretty side-by-side diff
optional arguments:
-h, --help show this help message and exit
-v, --version show program's version number and exit
--expand-tabs <n> expand tabs to <n> spaces; default: 8
--signs, --no-signs show sign columns; default: True
-U <n>, --unified <n>
show <n> lines of context; default: 3
--width <n> fit output to <n> columns; default: autodetect
```
### Git
Configure a `pdiff` `difftool`, and add some aliases to your liking, e.g.:
```
[difftool.pdiff]
cmd = "pdiff -- \"$LOCAL\" \"$REMOTE\" | less -R"
[alias]
dfp = difftool --tool=pdiff
dfpc = difftool --tool=pdiff --cached
```
## License
Licensed under the [MIT License](https://opensource.org/licenses/MIT).
Pretty side-by-side diff.
Inspired by [`cdiff`](https://github.com/ymattw/cdiff) and
[`icdiff`](https://github.com/jeffkaufman/icdiff).
## Installation
pip install pdiff
## Usage
```
usage: pdiff [<options>] [--] <old-file> <new-file>
Pretty side-by-side diff
optional arguments:
-h, --help show this help message and exit
-v, --version show program's version number and exit
--expand-tabs <n> expand tabs to <n> spaces; default: 8
--signs, --no-signs show sign columns; default: True
-U <n>, --unified <n>
show <n> lines of context; default: 3
--width <n> fit output to <n> columns; default: autodetect
```
### Git
Configure a `pdiff` `difftool`, and add some aliases to your liking, e.g.:
```
[difftool.pdiff]
cmd = "pdiff -- \"$LOCAL\" \"$REMOTE\" | less -R"
[alias]
dfp = difftool --tool=pdiff
dfpc = difftool --tool=pdiff --cached
```
## License
Licensed under the [MIT License](https://opensource.org/licenses/MIT).
Project details
Release history Release notifications | RSS feed
Download files
Download the file for your platform. If you're not sure which to choose, learn more about installing packages.
Source Distribution
pdiff-1.0.1.tar.gz
(4.4 kB
view hashes)
Built Distribution
Close
Hashes for pdiff-1.0.1-py2.py3-none-any.whl
Algorithm | Hash digest | |
---|---|---|
SHA256 | 053de2e67e6b57c4aa6b9e3c29b4feb957f75bf537ab81653db62fb944704ccc |
|
MD5 | 9b789c43d8f21a2b6a427cf233431dd9 |
|
BLAKE2b-256 | 1c5d114359ed5f0798274698cef89c18fae74b8357f0cee7cab8147da9bd1ea7 |