Git 2.5.0-rc2

Junio C Hamano committed about 11 years ago

Merge branch 'es/worktree-add'

Junio C Hamano committed about 11 years ago

Merge branch 'nd/multiple-work-trees'

Junio C Hamano committed about 11 years ago

Merge branch 'ss/clone-guess-dir-name-simplify'

Junio C Hamano committed about 11 years ago

Merge branch 'kb/config-unmap-before-renaming'

Junio C Hamano committed about 11 years ago

Merge branch 'mh/strbuf-read-file-returns-ssize-t'

Junio C Hamano committed about 11 years ago

Merge branch 'jc/unexport-git-pager-in-use-in-pager'

Junio C Hamano committed about 11 years ago

Merge branch 'kb/use-nsec-doc'

Junio C Hamano committed about 11 years ago

Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip'

Junio C Hamano committed about 11 years ago

Merge branch 'et/http-proxyauth'

Junio C Hamano committed about 11 years ago

Merge branch 'jc/fsck-retire-require-eoh'

Junio C Hamano committed about 11 years ago

fast-import: do less work when given "from" matches current branch head

Mike Hommey committed about 11 years ago

diff: parse ws-error-highlight option more strictly

René Scharfe committed about 11 years ago

Revert "checkout: retire --ignore-other-worktrees in favor of --force"

Junio C Hamano committed about 11 years ago

checkout: document subtlety around --ours/--theirs

Simon A. Eugster committed about 11 years ago

The last minute bits of fixes

Junio C Hamano committed about 11 years ago

Merge branch 'cb/rebase-am-exit-code'

Junio C Hamano committed about 11 years ago

Merge branch 'jk/fix-refresh-utime'

Junio C Hamano committed about 11 years ago

Merge branch 'mm/branch-doc-updates'

Junio C Hamano committed about 11 years ago

Merge branch 'ls/hint-rev-list-count'

Junio C Hamano committed about 11 years ago