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
dfcp = 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
dfcp = 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.0.tar.gz
(4.2 kB
view details)
Built Distribution
File details
Details for the file pdiff-1.0.0.tar.gz
.
File metadata
- Download URL: pdiff-1.0.0.tar.gz
- Upload date:
- Size: 4.2 kB
- Tags: Source
- Uploaded using Trusted Publishing? No
File hashes
Algorithm | Hash digest | |
---|---|---|
SHA256 | 3b509ea44dcb55f34a6a1c3e56609694b74d9ecff8bda35dc70950031ce17c57 |
|
MD5 | ced7d8d7c6fbde10c4be7a3e1d99f9ea |
|
BLAKE2b-256 | 2dbb675d46db370274658d20cb006395bd0141f7918cee72025eb509677bd5f9 |
Provenance
File details
Details for the file pdiff-1.0.0-py2.py3-none-any.whl
.
File metadata
- Download URL: pdiff-1.0.0-py2.py3-none-any.whl
- Upload date:
- Size: 6.5 kB
- Tags: Python 2, Python 3
- Uploaded using Trusted Publishing? No
File hashes
Algorithm | Hash digest | |
---|---|---|
SHA256 | bf2f73bb48bda6375c8b9ead264f34713e0f34dc59a6d2a76843efcf04b8e709 |
|
MD5 | 7ab857c1fc8798f0311538c8a611e3e5 |
|
BLAKE2b-256 | a485654862ec8522847ec622e597af39c7274de319960dcebeafed8674b147a4 |