Document that merge strategies can now take their own options

Junio C Hamano committed over 18 years ago

Extend merge-subtree tests to test -Xsubtree=dir.

Avery Pennarun committed almost 17 years ago

Make "subtree" part more orthogonal to the rest of merge-recursive.

Junio C Hamano committed over 18 years ago

pull: Fix parsing of -X<option>

Junio C Hamano committed almost 17 years ago

Teach git-pull to pass -X<option> to git-merge

Avery Pennarun committed almost 17 years ago

git merge -X<option>

Avery Pennarun committed almost 17 years ago

Update draft release notes to 1.7.0

Junio C Hamano committed almost 17 years ago

Merge branch 'tc/test-locate-httpd'

Junio C Hamano committed almost 17 years ago

Merge branch 'jh/commit-status'

Junio C Hamano committed almost 17 years ago

Merge branch 'jn/makefile'

Junio C Hamano committed almost 17 years ago

Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'

Junio C Hamano committed almost 17 years ago

Merge branch 'tc/clone-v-progress'

Junio C Hamano committed almost 17 years ago

Merge branch 'tc/smart-http-restrict'

Junio C Hamano committed almost 17 years ago

Merge branch 'jk/run-command-use-shell'

Junio C Hamano committed almost 17 years ago

Merge branch 'sr/gfi-options'

Junio C Hamano committed almost 17 years ago

git status: Show uncommitted submodule changes too when enabled

Jens Lehmann committed almost 17 years ago

Update COPYING with GPLv2 with new FSF address

Junio C Hamano committed almost 17 years ago

user_ident_sufficiently_given(): refactor the logic to be usable from elsewhere

Junio C Hamano committed almost 17 years ago

user_ident_sufficiently_given(): refactor the logic to be usable from elsewhere

Junio C Hamano committed almost 17 years ago

rerere: honor conflict-marker-size attribute

Junio C Hamano committed almost 17 years ago