skip to navigation
skip to content

Not Logged In

git-qdiff 0.2.2

Bzr tool's qdiff for git

git-qdiff (v0.2.2)
==================

So you miss `bzr qdiff` ?
-------------------------

Of course you do ! Why would you be here ?

Installation
------------

$ sudo pip install --upgrade git-qdiff

Dependencies
------------

- git (1.7.11+)
- bazaar
- qbzr tools
- rsync

Usage
-----

Once installed, you should be able to use this command from any git repository:

$ git qdiff

And this should launch your favorite difftool:

![screenshot]https://github.com/amigrave/git-qdiff/raw/master/screenshot.png

Of course you can use the same notation as you would with `git diff`:

```bash
# Show both staged and unstaged changes
$ git qdiff HEAD

# Using tilde and carrets
$ git qdiff HEAD~2..HEAD~3

# Between commits
$ git qdiff 53c43de..7c70faf

# Before merging branches
$ git qdiff origin/master...my_feature_branch

# ...
```

Known problem
-------------

- `Refresh` button won't work

Before reporting an issue, please check that your `bzr qdiff` tool works well
and that you can actually commit something with bazaar.

Goodies
-------

### tig

For those using [tig]http://jonas.nitro.dk/tig/) here's a handy shortcut bound to `D` key.
Add this to your `.gitconfig`:

```ini
[tig "bind"]
generic = D !git qdiff %(commit)~1..%(commit)
```

*Note: Don't try this on the "unstaged changes" line in tig's log view*

### alias

This alias is handy when you want to show a single commit in `git-qdiff`.
Add this to your `.gitconfig`:

```ini
[alias]
qshow = "!git show $1 --quiet; git qdiff $1~1...$1"
```

and use it like this:

$ git qshow 61376d9


License
-------

This software is licensed under the MIT license  
File Type Py Version Uploaded on Size
git-qdiff-0.2.2.tar.gz (md5) Source 2014-11-11 3KB
  • Downloads (All Versions):
  • 21 downloads in the last day
  • 121 downloads in the last week
  • 394 downloads in the last month