diff options
| author | Matthieu Gautier <mgautier@fedoraproject.org> | 2009-04-29 22:36:46 +0200 |
|---|---|---|
| committer | Matthieu Gautier <mgautier@fedoraproject.org> | 2009-04-29 22:36:46 +0200 |
| commit | fe6fa5a4ac78c2f45a92f84afd55faad7b7cbbdc (patch) | |
| tree | 53cbd2faf3841ea4b0001d91c4a1b6465419f92c | |
| parent | 27492e9d1ca951116d0b193fbd41e9146c7c66fc (diff) | |
| download | g-ed-it-fe6fa5a4ac78c2f45a92f84afd55faad7b7cbbdc.tar.gz g-ed-it-fe6fa5a4ac78c2f45a92f84afd55faad7b7cbbdc.tar.xz g-ed-it-fe6fa5a4ac78c2f45a92f84afd55faad7b7cbbdc.zip | |
'# On branch master
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# modified: g-ed-it/gitAction.py
#
Use git-difftool instead of git-diff.
- Force tool to be meld.
- No special config in git have to set
- meld become a prerequisite'
| -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 afcc954..bf4670d 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-diff","--cached",os.path.basename(fileUri)],stdout=subprocess.PIPE,cwd=os.path.dirname(fileUri)) + subprocess.call(["git-difftool","--tool=meld","--no-prompt","--cached",os.path.basename(fileUri)],stdout=subprocess.PIPE,cwd=os.path.dirname(fileUri)) pass def diff_index_wt(self, launcher, fileUriMethod = None): if fileUriMethod : fileUri = fileUriMethod() - subprocess.call(["git-diff",os.path.basename(fileUri)],stdout=subprocess.PIPE,cwd=os.path.dirname(fileUri)) + subprocess.call(["git-difftool","--tool=meld","--no-prompt",os.path.basename(fileUri)],stdout=subprocess.PIPE,cwd=os.path.dirname(fileUri)) pass |