Re: version control and git

[MM]

On 10 March 2015 at 21:28, Michael Albinus <address@hidden> wrote:

MM <address@hidden> writes:

> Hello,

Hi,

> Tramp is setup to open remote files
>
> with Ctrl-F /plink:address@hidden:filepath
>
> the file is under version control on the server by git.
>
> Is there a way to get emacs to recognize that?

Usually, Tramp has no problem with this; I access often remote files
under version control.

However, vc might be enabled only when the respective version control
system is also available locally. This might prevent detection of git
controlled remote files in your case.

Just a guess; I don't use MS Windows, so I cannot check this.

> Also, i'd like VC to use git diff to make diffs, and potentially other
> git actions

Personally, I have no problems with the default ediff settings. I'm
pretty sure it is customizable to your needs. However, it seems to work
with the local diff command, even for remote files. If you don't run git
on your local machine, it might be problmatic.

> Rds,
>
> MM

Best regards, Michael.

Thanks,

Right, it does work fine. At some point, I wanted to have emacs recognize _local_ files also as under git control, then I added this:

(require 'vc)

(setq vc-git-program "C:/Program Files (x86)/Git/bin/git.exe")

At this point, emacs/tramp detecting remote files under git started to fail.

Is there a way to get it to work for both local and remote files?