How can I preview a merge in git?

by
  • git log ..otherbranch
    • list of changes that will be merged into current branch.
  • git diff ...otherbranch
    • diff from common ancestor (merge base) to the head of what will be merged. Note the three dots, which have a special meaning compared to two dots (see below).
  • gitk ...otherbranch
    • graphical representation of the branches since they were merged last time.

Empty string implies HEAD, so that’s why just ..otherbranch instead of HEAD..otherbranch.

The two vs. three dots have slightly different meaning for diff than for the commands that list revisions (log, gitk etc.). For log and others two dots (a..b) means everything that is in b but not a and three dots (a...b) means everything that is in only one of a or b. But diff works with two revisions and there the simpler case represented by two dots (a..b) is simple difference from a to b and three dots (a...b) mean difference between common ancestor and b (git diff $(git merge-base a b)..b).

More Related Contents:

  1. How do I resolve merge conflicts in a Git repository?
  2. Undo a Git merge that hasn’t been pushed yet
  3. When do you use Git rebase instead of Git merge?
  4. How to cherry-pick a range of commits and merge them into another branch?
  5. Have Git Select Local Version On Merge Conflict on a Specific File?
  6. How can I selectively merge or pick changes from another branch in Git?
  7. Git workflow and rebase vs merge questions
  8. Why does git perform fast-forward merges by default?
  9. Git merge left HEAD marks in my files
  10. Undo git pull, how to bring repos to old state
  11. How to import existing Git repository into another?
  12. How can I prevent foxtrot merges in my ‘master’ branch?
  13. Resolve Git merge conflicts in favor of their changes during a pull
  14. How can I merge two commits into one if I already started rebase?
  15. .gitignore and “The following untracked working tree files would be overwritten by checkout”
  16. How to resolve git error: “Updates were rejected because the tip of your current branch is behind”
  17. git remove merge commit from history
  18. tell git to use ours merge strategy on specific files
  19. git merge, keep both
  20. Merge development branch with master
  21. Merging without whitespace conflicts
  22. How can I configure KDiff3 as a merge tool and diff tool for git?
  23. Is it possible to pull just one file in Git?
  24. Sharing rerere cache
  25. Restart/undo conflict resolution in a single file
  26. Is there a git-merge –dry-run option?
  27. Git merge doesn’t use default merge message, opens editor with default message
  28. Merging two remote repositories in Git
  29. Git: Merge a Commit into a different Branch
  30. Restore git files deleted after git merge –abort

Leave a Comment