search

Home  >  Q&A  >  body text

How to configure the merge graphical tool on the git command line?

When using git under the command line, merge is very inconvenient. How to configure the graphical tool?

黄舟黄舟2834 days ago634

reply all(2)I'll reply

  • PHP中文网

    PHP中文网2017-05-02 09:29:56

    [diff]
      tool = tortoisediff
    [difftool]
      prompt = false
    [merge]
      tool = tortoisemerge
    [mergetool]
      prompt = false
      keepBackup = false
    
    [difftool "tortoisediff"]
    cmd = "TortoiseMerge.exe" -mine:"$REMOTE" -base:"$LOCAL"
    
    [mergetool "tortoisemerge"]
    cmd = "TortoiseMerge.exe" -base:"$BASE" -theirs:"$REMOTE" -mine:"$LOCAL" -merged:"$MERGED"

    It’s really fun to use the command line with tortoisemerge

    reply
    0
  • PHPz

    PHPz2017-05-02 09:29:56

    As long as the system has image operation, there are a lot of GUI Git clients, which can operate Git very conveniently. I recommend one of them: SourceTree, which is full-featured and cross-platform.
    https://www.sourcetreeapp.com/

    reply
    0
  • Cancelreply