Uploaded image for project: 'Sourcetree for Windows'
  1. Sourcetree for Windows
  2. SRCTREEWIN-8959

Support reviewing merge commits (git show <merge-commit-hash>)

    XMLWordPrintable

Details

    • Suggestion
    • Resolution: Unresolved
    • None
    • Git

    • Our product teams collect and evaluate feedback from a number of different sources. To learn more about how we use customer feedback in the planning process, check out our new feature policy.

    Description

      Sourcetree does not support showing merge commits in a special way. 
      http://haacked.com/archive/2014/02/21/reviewing-merge-commits/

      We can only view complete diff compared to both parents, not what changes the merge commit introduced itself over the two parents. Reading all of it would mean to review it a second time.

      The point is that when a merge has conflicts, only those conflict resolution changes need further review, or might be interesting otherwise. Automatic, unchanged merges have already been reviewed and should be just fine.

      TortoiseGit already has this feature to "Show extra changes after merge" https://gitlab.com/tortoisegit/tortoisegit/issues/2469

      We can use CLI to view these extra changes using:

      • git show <hash>
      • git diff-tree --cc <hash>

      SourceTree should also provide this feature.

      Attachments

        Activity

          People

            Unassigned Unassigned
            31abf151f812 armujahid
            Votes:
            2 Vote for this issue
            Watchers:
            1 Start watching this issue

            Dates

              Created:
              Updated: