Merge branch 'maint'

Junio C Hamano committed about 13 years ago

git-prune-packed.txt: fix reference to GIT_OBJECT_DIRECTORY

Steffen Prohaska committed about 13 years ago

git.txt: fix asciidoc syntax of --*-pathspecs

Steffen Prohaska committed about 13 years ago

doc/cli: make "dot repository" an independent bullet point

Philip Oakley committed about 13 years ago

remote: do not copy "origin" string literal

Jeff King committed about 13 years ago

bash prompt: don't use '+=' operator in show upstream code path

SZEDER Gábor committed about 13 years ago

split_ident: parse timestamp from end of line

Jeff King committed about 13 years ago

remote-curl: rewrite base url from info/refs redirects

Jeff King committed about 13 years ago

remote-curl: store url as a strbuf

Jeff King committed about 13 years ago

remote-curl: make refs_url a strbuf

Jeff King committed about 13 years ago

http: update base URLs when we see redirects

Jeff King committed about 13 years ago

http: provide effective url to callers

Jeff King committed about 13 years ago

http: hoist credential request out of handle_curl_result

Jeff King committed about 13 years ago

mergetool--lib: Fix typo in the merge/difftool help

Stefan Saasen committed about 13 years ago

sparse: suppress some "using sizeof on a function" warnings

Ramsay Jones committed about 13 years ago

format-patch doc: Thunderbird wraps lines unless mailnews.wraplength=0

Ramsay Jones committed about 13 years ago

Merge branch 'rj/highlight-test-hang'

Jonathan Nieder committed about 13 years ago

gitweb test: fix highlight test hang on Linux Mint

Ramsay Jones committed about 13 years ago

wrapper.c: only define gitmkstemps if needed

Ramsay Jones committed about 13 years ago

refs.c: spell NULL pointer as NULL

Ramsay Jones committed about 13 years ago