Merge branch 'rs/maint-retval-fix' into maint

Junio C Hamano committed almost 18 years ago

Merge branch 'sp/maint-describe-all-tag-warning' into maint

Junio C Hamano committed almost 18 years ago

git-send-email.txt: move --format-patch paragraph to a proper location

Adeodato Simó committed almost 18 years ago

git-shortlog.txt: improve documentation about .mailmap files

Adeodato Simó committed almost 18 years ago

pretty: support multiline subjects with format:

René Scharfe committed almost 18 years ago

pretty: factor out format_subject()

René Scharfe committed almost 18 years ago

pretty: factor out skip_empty_lines()

René Scharfe committed almost 18 years ago

merge-file: handle freopen() failure

René Scharfe committed almost 18 years ago

daemon: cleanup: factor out xstrdup_tolower()

René Scharfe committed almost 18 years ago

daemon: cleanup: replace loop with if

René Scharfe committed almost 18 years ago

daemon: handle freopen() failure

René Scharfe committed almost 18 years ago

describe: Avoid unnecessary warning when using --all

Shawn O. Pearce committed almost 18 years ago

ls-tree: add --full-tree option

Junio C Hamano committed almost 18 years ago

merge-recursive: mark rename/delete conflict as unmerged

Johannes Schindelin committed almost 18 years ago

http-push: support full URI in handle_remote_ls_ctx()

Kirill A. Korinskiy committed almost 18 years ago

GIT 1.6.1

Junio C Hamano committed almost 18 years ago

Merge branch 'js/rebase-i-p'

Junio C Hamano committed almost 18 years ago

rebase -i -p: leave a --cc patch when a merge could not be redone

Johannes Schindelin committed almost 18 years ago

t9129: skip the last three tests if UTF-8 locale is not available

Miklos Vajna committed almost 18 years ago

GIT 1.6.1-rc4

Junio C Hamano committed almost 18 years ago