Announcement

Collapse
No announcement yet.

SourceTree configuration

Collapse
X
  • Filter
  • Time
  • Show
Clear All
new posts

  • SourceTree configuration

    Visual Diff Tool: Other
    Diff Command:/usr/local/bin/bcomp
    Parameters:$LOCAL $REMOTE
    Merge Tool: Other
    Merge Command:/usr/local/bin/bcomp
    Paramters:$LOCAL $REMOTE $BASE $MERGED

  • #2
    Thanks for the configuration.
    Aaron P Scooter Software

    Comment


    • #3
      Side note: SourceTree has a built in list of compare tools.
      Would be great to contact them to add BC to it.
      I have seen somewhere else that someone suggested this, not sure if it was for SourceTree as well.

      Oh and fyi, sourcetree just append to ~/.gitconfig this:
      # sourcetree

      [difftool "sourcetree"]
      cmd = bcomp $LOCAL $REMOTE
      path =
      [mergetool "sourcetree"]
      cmd = bcomp $LOCAL $REMOTE $BASE $MERGED
      trustExitCode = true

      Comment


      • #4
        A suggestion for the diff case is to use the "-ro" parameter to disable editing when viewing a diff.
        Parameters:-ro $LOCAL $REMOTE

        Comment


        • #5
          Originally posted by carbncl View Post
          Side note: SourceTree has a built in list of compare tools.
          Would be great to contact them to add BC to it.
          Here you go: https://jira.atlassian.com/browse/SRCTREE-2092

          Comment


          • #6
            Smart, I definitely second the -ro addition.

            Comment


            • #7
              Thanks for opening that request form. I've also updated the forum post with "-ro"
              Aaron P Scooter Software

              Comment


              • #8
                Originally posted by nevil View Post
                A suggestion for the diff case is to use the "-ro" parameter to disable editing when viewing a diff.
                Parameters:-ro $LOCAL $REMOTE
                I've found that if you have spaces in your file paths you need to add quotes around the parameters: -ro "$LOCAL" "$REMOTE"

                Comment


                • #9
                  Guys, I made a request for adding BeyondCompare as a recognized diff/merge tool for SourceTree, please vote/add comments there.

                  https://jira.atlassian.com/browse/SRCTREE-2156

                  Comment


                  • #10
                    To get this working, you first need to install the Beyond Compare command line tools.

                    From the main menu, choose Beyond Compare -> Install Command Line Tools..., then follow the instructions.

                    That will install /usr/local/bin/bcomp and /usr/local/bin/bcompare on your Mac.

                    Comment

                    Working...
                    X