merge-recursive: improve auto-merging messages with path collisions

Elijah Newren committed almost 8 years ago

headers: normalize the spelling of some header guards

Ramsay Jones committed almost 8 years ago

list-objects: support for skipping tree traversal

Matthew DeVore committed almost 8 years ago

test-tool: show tool list on error

Jeff King committed almost 8 years ago

doc: fix small typo in git show-branch

Saulius Gurklys committed almost 8 years ago

builtin/submodule--helper: remove debugging leftover tracing

Stefan Beller committed almost 8 years ago

branch: trivial style fix

Tao Qingyun committed almost 8 years ago

submodule helper: convert relative URL to absolute URL if needed

Stefan Beller committed almost 8 years ago

Revert "subtree: make install targets depend on build targets"

Junio C Hamano committed almost 8 years ago

builtin/branch.c: remove useless branch_get

Tao Qingyun committed almost 8 years ago

subtree: make install targets depend on build targets

Christian Hesse committed almost 8 years ago

send-email: also pick up cc addresses from -by trailers

Rasmus Villemoes committed almost 8 years ago

Fourth batch for 2.20

Junio C Hamano committed almost 8 years ago

Merge branch 'sf/complete-stash-list'

Junio C Hamano committed almost 8 years ago

Merge branch 'mw/doc-typofixes'

Junio C Hamano committed almost 8 years ago

Merge branch 'js/mingw-wants-vista-or-above'

Junio C Hamano committed almost 8 years ago

Merge branch 'rs/sequencer-oidset-insert-avoids-dups'

Junio C Hamano committed almost 8 years ago

Merge branch 'jk/oideq-hasheq-cleanup'

Junio C Hamano committed almost 8 years ago

Merge branch 'ma/mailing-list-address-in-git-help'

Junio C Hamano committed almost 8 years ago

Merge branch 'nd/packobjectshook-doc-fix'

Junio C Hamano committed almost 8 years ago