merge-recursive: option to disable renames

Felipe Gonçalves Assis committed over 10 years ago

Merge branch 'maint'

Junio C Hamano committed over 10 years ago

Seventh batch for the 2.8 cycle

Junio C Hamano committed over 10 years ago

Merge branch 'dw/mergetool-vim-window-shuffle'

Junio C Hamano committed over 10 years ago

Merge branch 'ah/stripspace-optstring'

Junio C Hamano committed over 10 years ago

Merge branch 'mm/clean-doc-fix'

Junio C Hamano committed over 10 years ago

Merge branch 'jk/rerere-xsnprintf'

Junio C Hamano committed over 10 years ago

Merge branch 'jk/test-path-utils-xsnprintf'

Junio C Hamano committed over 10 years ago

Merge branch 'da/user-useconfigonly'

Junio C Hamano committed over 10 years ago

Merge branch 'nd/clear-gitenv-upon-use-of-alias'

Junio C Hamano committed over 10 years ago

Merge branch 'js/mingw-tests'

Junio C Hamano committed over 10 years ago

Merge branch 'mg/mingw-test-fix'

Junio C Hamano committed over 10 years ago

Merge branch 'jk/drop-rsync-transport'

Junio C Hamano committed over 10 years ago

Start preparing for 2.7.2

Junio C Hamano committed over 10 years ago

Merge branch 'js/test-lib-windows-emulated-yes' into maint

Junio C Hamano committed over 10 years ago

Merge branch 'aw/push-force-with-lease-reporting' into maint

Junio C Hamano committed over 10 years ago

Merge branch 'nd/do-not-move-worktree-manually' into maint

Junio C Hamano committed over 10 years ago

Merge branch 'js/xmerge-marker-eol' into maint

Junio C Hamano committed over 10 years ago

git-cvsserver.perl: fix typo

GyuYong Jung committed over 10 years ago

t5505: 'remote add x y' should work when url.y.insteadOf = x

Johannes Schindelin committed over 10 years ago