From: David Aguilar <davvid@gmail.com>
To: Jens Otten <j.otten@plusserver.de>
Cc: git@vger.kernel.org
Subject: Re: Feature or a bug: git aliases are executed in git-root directory
Date: Fri, 16 Apr 2010 01:34:21 -0700 [thread overview]
Message-ID: <20100416083419.GA30372@gmail.com> (raw)
In-Reply-To: <4BC5A483.6060206@plusserver.de>
On Wed, Apr 14, 2010 at 01:18:27PM +0200, Jens Otten wrote:
> 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?
Yes. Use git-difftool =)
http://www.kernel.org/pub/software/scm/git/docs/git-difftool.html
git difftool -t meld -- <path>
> thanks for your help
> jens
HTH,
--
David
prev parent reply other threads:[~2010-04-16 8:34 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-14 11:18 Feature or a bug: git aliases are executed in git-root directory Jens Otten
2010-04-14 13:10 ` Sverre Rabbelier
2010-04-16 8:34 ` David Aguilar [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100416083419.GA30372@gmail.com \
--to=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=j.otten@plusserver.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).