Merge branch 'jk/maint-break-rename-reduce-memory'

Junio C Hamano committed almost 17 years ago

Merge branch 'tc/format-attribute'

Junio C Hamano committed almost 17 years ago

Merge branch 'tr/maint-merge-ours-clarification' (early part)

Junio C Hamano committed almost 17 years ago

log --format: document %w

René Scharfe committed almost 17 years ago

strbuf_add_wrapped_text(): factor out strbuf_add_indented_text()

René Scharfe committed almost 17 years ago

grep: unset GREP_OPTIONS before spawning external grep

René Scharfe committed almost 17 years ago

User Manual: Write "Git" instead of "GIT"

Björn Gustavsson committed almost 17 years ago

Fix truncated usage messages

Björn Gustavsson committed almost 17 years ago

user-manual: Document that "git merge" doesn't like uncommited changes.

Matthieu Moy committed almost 17 years ago

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