merge-recursive: point the user to commit when file would be overwritten.

Matthieu Moy committed almost 17 years ago

git svn: always reuse existing remotes on fetch

Eric Wong committed almost 17 years ago

t9001: test --envelope-sender option of send-email

Junio C Hamano committed almost 17 years ago

apply: Use the term "working tree" consistently

Björn Gustavsson committed almost 17 years ago

apply: Format all options using back-quotes

Björn Gustavsson committed almost 17 years ago

apply: apply works outside a repository

Björn Gustavsson committed almost 17 years ago

Clarify and correct -z

Björn Gustavsson committed almost 17 years ago

"rebase --onto A...B" replays history on the merge base between A and B

Junio C Hamano committed almost 17 years ago

Documentation: avoid xmlto input error

Junio C Hamano committed almost 17 years ago

Merge branch 'jc/fix-tree-walk' (early part)

Junio C Hamano committed almost 17 years ago

Merge branch 'jh/notes' (early part)

Junio C Hamano committed almost 17 years ago

Merge branch 'sp/smart-http'

Junio C Hamano committed almost 17 years ago

Merge branch 'bw/autoconf-more'

Junio C Hamano committed almost 17 years ago

Merge branch 'jn/editor-pager'

Junio C Hamano committed almost 17 years ago

Merge branch 'rj/cygwin-msvc'

Junio C Hamano committed almost 17 years ago

Merge branch 'rj/maint-simplify-cygwin-makefile'

Junio C Hamano committed almost 17 years ago

Merge branch 'bg/format-patch-doc-update'

Junio C Hamano committed almost 17 years ago

Merge branch 'tr/filter-branch'

Junio C Hamano committed almost 17 years ago

Merge branch 'sc/protocol-doc'

Junio C Hamano committed almost 17 years ago

Merge branch 'jl/submodule-add-noname'

Junio C Hamano committed almost 17 years ago