Merge git://git.bogomips.org/git-svn

Junio C Hamano committed almost 17 years ago

git-svn: allow subset of branches/tags to be specified in glob spec

Jay Soffian committed almost 17 years ago

git-svn: allow UUID to be manually remapped via rewriteUUID

Jay Soffian committed almost 17 years ago

git-svn: update svn mergeinfo test suite

Andrew Myrick committed almost 17 years ago

git-svn: document --username/commit-url for branch/tag

Igor Mironov committed almost 17 years ago

git-svn: add --username/commit-url options for branch/tag

Igor Mironov committed almost 17 years ago

git-svn: respect commiturl option for branch/tag

Igor Mironov committed almost 17 years ago

git-svn: fix mismatched src/dst errors for branch/tag

Igor Mironov committed almost 17 years ago

git-svn: handle merge-base failures

Andrew Myrick committed almost 17 years ago

git-svn: ignore changeless commits when checking for a cherry-pick

Andrew Myrick committed almost 17 years ago

t7800-difftool.sh: Test mergetool.prompt fallback

David Aguilar committed almost 17 years ago

msvc: Add a definition of NORETURN compatible with msvc compiler

Ramsay Jones committed almost 17 years ago

Update draft release notes to 1.7.0

Junio C Hamano committed almost 17 years ago

msvc: Fix a compiler warning due to an incorrect pointer cast

Ramsay Jones committed almost 17 years ago

msvc: Fix an "unrecognized option" linker warning

Ramsay Jones committed almost 17 years ago

Merge branch 'maint'

Junio C Hamano committed almost 17 years ago

Merge branch 'jc/branch-d'

Junio C Hamano committed almost 17 years ago

Merge branch 'il/rev-glob'

Junio C Hamano committed almost 17 years ago

Merge branch 'js/refer-upstream'

Junio C Hamano committed almost 17 years ago

Merge branch 'jl/submodule-diff'

Junio C Hamano committed almost 17 years ago