Thanks to visit codestin.com
Credit goes to github.com

Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: git/git
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: erikvanzijst/git
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: merge-tree-v1.7.6
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Aug 16, 2011

  1. Configurable diff context in merge-tree command 

    Added support for the -U/--unified command line arguments to the
git-merge-tree command to change the number of context lines that
are generated.

Signed-off-by: Erik van Zijst <[email protected]>

Conflicts:

	Documentation/git-merge-tree.txt
	builtin/merge-tree.c
    @erikvanzijst
    erikvanzijst committed Aug 16, 2011
    Configuration menu
    Copy the full SHA
    ee56bfa View commit details
    Browse the repository at this point in the history
Loading