Page 2 of 2 FirstFirst 12
Results 11 to 13 of 13
  1. #11
    Join Date
    Nov 2016
    Posts
    11

    Default

    As pointed out on https://superuser.com/questions/5837...ommand-prompt:

    git difftool and git difftool path/to/file will always print the diff on the console
    git difftool head and git difftool head path/to/file will use Beyond compare (or whatever you configured) to show the diff.

    For whatever reason which seems to be missing from the GIT manual.

  2. #12
    Join Date
    Oct 2007
    Location
    Madison, WI
    Posts
    11,787

    Default

    Hello,

    That sounds like a bug with the specific version of Git, or the .gitconfig is not properly configured for the current command line (git bash or command line) you are using.

    I would suggest running the --config command lines documented here on the same command line you are executing the "git difftool" command:
    http://www.scootersoftware.com/suppo...vcs#gitwindows

    This will help verify that the .gitconfig for the current view is configured, which should prompt for "Viewing (1/X) 'file.txt'. Launch bc [Y/n]"

    I would also suggest updating Git.
    Aaron P Scooter Software

  3. #13
    Join Date
    Jul 2018
    Posts
    2

    Default POSIX to Windows path conversion

    I've been using Beyond Compare with git for ages (using MacOS) but then I hit this sort of issue when trying to integrate with the new Windows Ubuntu bash tooling. I found a problem to do with the conversion of the posix folder path to windows. Once I found a way to convert the path to Windows both of the files appeared correctly. Word of warning though, apparently you're not supposed to edit the posix files with windows applications. I did have some strange behaviour with one file disappearing from the posix fs but still visible on the windows fs.

    The script I found for converting from posix to windows paths can be found here : https://github.com/laurent22/wslpath. I did have to make one modification so that the /tmp/ files could be found by BC4. I mentioned it in issue #7. The patch I mentioned was applied to commit b9e739c654274e600dca6a2435f8a40db24036fd on my local machine.

Posting Permissions

  • You may not post new threads
  • You may not post replies
  • You may not post attachments
  • You may not edit your posts
  •