diff options
| author | Matthieu Gautier <mgautier@fedoraproject.org> | 2009-04-30 23:19:08 +0200 |
|---|---|---|
| committer | Matthieu Gautier <mgautier@fedoraproject.org> | 2009-04-30 23:19:08 +0200 |
| commit | b9ec0c418594803394bd16bc015e0c2970606e86 (patch) | |
| tree | 7c4bbfed16cf5a59b84f50b171f69d69d173f6b9 /g-ed-it | |
| parent | 634bf949864e0185e27538a52505252d2b61962b (diff) | |
| download | g-ed-it-b9ec0c418594803394bd16bc015e0c2970606e86.tar.gz g-ed-it-b9ec0c418594803394bd16bc015e0c2970606e86.tar.xz g-ed-it-b9ec0c418594803394bd16bc015e0c2970606e86.zip | |
Revert to git-diff.
git-difftool is not yet present in the current version of git (Fedora).
Use a git-difftool will be recommit when next git update.
Diffstat (limited to 'g-ed-it')
| -rw-r--r-- | g-ed-it/gitAction.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/g-ed-it/gitAction.py b/g-ed-it/gitAction.py index f25706c..47bd68e 100644 --- a/g-ed-it/gitAction.py +++ b/g-ed-it/gitAction.py @@ -51,10 +51,10 @@ class GitAction (object): def diff_head_index(self,launcher, fileUriMethod = None): if fileUriMethod : fileUri = fileUriMethod() - subprocess.call("git-difftool --tool=meld --no-prompt --cached "+os.path.basename(fileUri),stdout=subprocess.PIPE,cwd=os.path.dirname(fileUri), shell=True) + subprocess.call("git-diff --cached "+os.path.basename(fileUri),stdout=subprocess.PIPE,cwd=os.path.dirname(fileUri), shell=True) pass def diff_index_wt(self, launcher, fileUriMethod = None): if fileUriMethod : fileUri = fileUriMethod() - subprocess.call("git-difftool --tool=meld --no-prompt "+os.path.basename(fileUri),stdout=subprocess.PIPE,cwd=os.path.dirname(fileUri), shell=True) + subprocess.call("git-diff "+os.path.basename(fileUri),stdout=subprocess.PIPE,cwd=os.path.dirname(fileUri), shell=True) pass |