summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sg/t3600-nul-sha1-fix'Junio C Hamano2013-10-301-7/+4
|\
| * t3600: fix broken "choking git rm" testsg/t3600-nul-sha1-fixSZEDER Gábor2013-10-161-7/+4
* | Merge branch 'fc/styles'Junio C Hamano2013-10-3011-18/+19
|\ \
| * | block-sha1/sha1.c: have SP around arithmetic operatorsfc/stylesJunio C Hamano2013-10-161-2/+2
| * | base85.c: have SP around arithmetic operatorsJunio C Hamano2013-10-161-1/+1
| * | archive.c: have SP around arithmetic operatorsJunio C Hamano2013-10-161-1/+1
| * | alloc.c: have SP around arithmetic operatorsJunio C Hamano2013-10-161-1/+1
| * | abspath.c: have SP around arithmetic operatorsJunio C Hamano2013-10-161-2/+2
| * | alias: have SP around arithmetic operatorsFelipe Contreras2013-10-161-6/+7
| * | C: have space around && and || operatorsJunio C Hamano2013-10-165-5/+5
* | | Merge branch 'jc/upload-pack-send-symref'Junio C Hamano2013-10-306-22/+125
|\ \ \
| * | | t5570: Update for clone-progress-to-stderr branchjc/upload-pack-send-symrefBrian Gernhardt2013-10-221-2/+1
| * | | Merge branch 'jk/clone-progress-to-stderr' into jc/upload-pack-send-symrefJunio C Hamano2013-10-224-28/+32
| |\ \ \
| * | | | t5570: Update for symref capabilityBrian Gernhardt2013-10-221-1/+1
| * | | | clone: test the new HEAD detection logicJunio C Hamano2013-09-171-0/+11
| * | | | connect: annotate refs with their symref information in get_remote_head()Junio C Hamano2013-09-172-11/+64
| * | | | connect.c: make parse_feature_value() staticJunio C Hamano2013-09-172-2/+2
| * | | | upload-pack: send non-HEAD symbolic refsJunio C Hamano2013-09-171-0/+1
| * | | | upload-pack: send symbolic ref information as capabilityJunio C Hamano2013-09-171-5/+43
| * | | | upload-pack.c: do not pass confusing cb_data to mark_our_ref()Junio C Hamano2013-09-171-1/+1
| * | | | t5505: fix "set-head --auto with ambiguous HEAD" testJunio C Hamano2013-09-171-0/+1
* | | | | Merge branch 'jk/http-auth-redirects'Junio C Hamano2013-10-307-65/+191
|\ \ \ \ \
| * | | | | http.c: Spell the null pointer as NULLjk/http-auth-redirectsRamsay Jones2013-10-241-1/+1
| * | | | | remote-curl: rewrite base url from info/refs redirectsJeff King2013-10-144-1/+19
| * | | | | remote-curl: store url as a strbufJeff King2013-10-141-19/+19
| * | | | | remote-curl: make refs_url a strbufJeff King2013-10-141-8/+7
| * | | | | http: update base URLs when we see redirectsJeff King2013-10-142-0/+68
| * | | | | http: provide effective url to callersJeff King2013-10-142-0/+10
| * | | | | http: hoist credential request out of handle_curl_resultJeff King2013-10-143-3/+11
| * | | | | http: refactor options to http_get_*Jeff King2013-09-304-28/+44
| * | | | | http_request: factor out curlinfo_strbufJeff King2013-09-301-7/+14
| * | | | | http_get_file: style fixesJeff King2013-09-301-2/+2
* | | | | | Almost -rc0 for 1.8.5Junio C Hamano2013-10-281-0/+15
* | | | | | Sync with v1.8.4.2Junio C Hamano2013-10-284-3/+18
|\ \ \ \ \ \
| * | | | | | Git 1.8.4.2v1.8.4.2Junio C Hamano2013-10-283-2/+17
| * | | | | | Merge branch 'jk/clone-progress-to-stderr' into maintJunio C Hamano2013-10-284-28/+32
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | Merge branch 'jk/format-patch-from' into maintJunio C Hamano2013-10-284-1/+49
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/shortlog-tolerate-broken-commit' into maintJunio C Hamano2013-10-282-2/+20
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/diff-algo' into maintJunio C Hamano2013-10-281-2/+2
| |\ \ \ \ \ \ \ \
| * | | | | | | | | test-lib: fix typo in commentTorstein Hegge2013-10-281-1/+1
| * | | | | | | | | sha1_file: move comment about return value where it belongsChristian Couder2013-10-281-1/+1
* | | | | | | | | | Merge branch 'sb/repack-in-c'Junio C Hamano2013-10-281-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Reword repack documentation to no longer state it's a scriptStefan Beller2013-10-221-1/+1
* | | | | | | | | | | Merge branch 'sg/prompt-svn-remote-fix'Junio C Hamano2013-10-281-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | bash prompt: don't use '+=' operator in show upstream code pathsg/prompt-svn-remote-fixSZEDER Gábor2013-10-151-1/+1
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jk/split-broken-ident'Junio C Hamano2013-10-282-3/+22
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | split_ident: parse timestamp from end of linejk/split-broken-identJeff King2013-10-152-3/+22
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'jk/remote-literal-string-leakfix'Junio C Hamano2013-10-281-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | remote: do not copy "origin" string literaljk/remote-literal-string-leakfixJeff King2013-10-151-1/+1
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'ew/keepalive'Junio C Hamano2013-10-281-0/+38
|\ \ \ \ \ \ \ \ \ \ \