Feature or a bug: git aliases are executed in git-root directory
Hi,
i started to use git (version is 1.6.3.3 (ubuntu)) and it is really great!
but i have one problem when using aliases. maybe i made a mistake, but here is my problem.
i set up my ~/.gitconfig as follows:
----------
...
[alias]
meld = !GIT_EXTERNAL_DIFF='git-diff-to-meld-redirect' git diff
...
----------
now when i work in a subdirectory of my git-root dir and want to make a diff, this works perfectly:
$ cd ~/git-root/subdir $ git diff some_file
but when doing the same using the alias i get an error:
$ cd ~/git-root/subdir $ git meld some_file fatal: ambiguous argument 'some_file': unknown revision or path not in the working tree. Use '--' to separate paths from revisions
whereas using the relative path starting from the git-root directory works
$ cd ~/git-root/subdir $ git meld subdir/some_file
is there a way to solve this problem?
thanks for your help
jens
Heya,
Quoted 1 line · Jens Otten
is there a way to solve this problem?
Yes, put this script in your path (and make it executable):
cat > git-meld << EOF
#!/bin/sh
GIT_EXTERNAL_DIFF='git-diff-to-meld-redirect' git diff "$@" EOF
Signature · 3 lines
Cheers, Sverre Rabbelier
Quoted 27 lines · Jens Otten
Hi,
i started to use git (version is 1.6.3.3 (ubuntu)) and it is really great!
but i have one problem when using aliases. maybe i made a mistake, but here is my problem.
i set up my ~/.gitconfig as follows:
----------
...
[alias]
meld = !GIT_EXTERNAL_DIFF='git-diff-to-meld-redirect' git diff
...
----------now when i work in a subdirectory of my git-root dir and want to make a diff, this works perfectly:
$ cd ~/git-root/subdir $ git diff some_filebut when doing the same using the alias i get an error:
$ cd ~/git-root/subdir $ git meld some_file fatal: ambiguous argument 'some_file': unknown revision or path not in the working tree. Use '--' to separate paths from revisions
Quoted 5 lines
whereas using the relative path starting from the git-root directory works
$ cd ~/git-root/subdir $ git meld subdir/some_fileis there a way to solve this problem?
Yes. Use git-difftool =)
http://www.kernel.org/pub/software/scm/git/docs/git-difftool.html
git difftool -t meld -- <path>
Quoted 2 lines
thanks for your help
jens
HTH,
Signature · 1 line
David