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 over 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

Merge branch 'jk/rev-list-no-bitmap-while-pruning'

Junio C Hamano committed about 11 years ago

Merge branch 'cb/subtree-tests-update'

Junio C Hamano committed about 11 years ago

Merge branch 'rh/test-color-avoid-terminfo-in-original-home'

Junio C Hamano committed about 11 years ago

Merge branch 'sb/p5310-and-chain'

Junio C Hamano committed about 11 years ago

Merge branch 'tb/checkout-doc'

Junio C Hamano committed about 11 years ago

Merge branch 'jk/pretty-encoding-doc'

Junio C Hamano committed about 11 years ago

Merge branch 'nd/dwim-wildcards-as-pathspecs'

Junio C Hamano committed about 11 years ago

Documentation/tag: remove double occurance of "<pattern>"

Karthik Nayak committed over 11 years ago

Merge branch 'jk/maint-for-each-packed-object'

Junio C Hamano committed about 11 years ago

Merge branch 'jc/fix-alloc-sortbuf-in-index-pack'

Junio C Hamano committed about 11 years ago