Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dp/autoconf-curl-ssl' | Junio C Hamano | 2016-10-10 | 1 | -10/+11 |
|\ | |||||
| * | ./configure.ac: detect SSL in libcurl using curl-configdp/autoconf-curl-ssl | Дилян Палаузов | 2016-06-28 | 1 | -10/+11 |
* | | Merge branch 'ak/curl-imap-send-explicit-scheme' | Junio C Hamano | 2016-10-10 | 1 | -0/+1 |
|\ \ | |||||
| * | | imap-send: Tell cURL to use imap:// or imaps://ak/curl-imap-send-explicit-scheme | Anders Kaseorg | 2016-08-17 | 1 | -0/+1 |
* | | | Merge branch 'jk/pack-objects-optim-mru' | Junio C Hamano | 2016-10-10 | 7 | -12/+227 |
|\ \ \ | |||||
| * | | | pack-objects: use mru list when iterating over packsjk/pack-objects-optim-mru | Jeff King | 2016-08-11 | 1 | -3/+7 |
| * | | | pack-objects: break delta cycles before delta-search phase | Jeff King | 2016-08-11 | 3 | -0/+206 |
| * | | | sha1_file: make packed_object_info public | Jeff King | 2016-08-11 | 2 | -2/+3 |
| * | | | provide an initializer for "struct object_info" | Jeff King | 2016-08-11 | 4 | -8/+12 |
* | | | | Merge branch 'rs/qsort' | Junio C Hamano | 2016-10-10 | 35 | -78/+97 |
|\ \ \ \ | |||||
| * | | | | show-branch: use QSORTrs/qsort | René Scharfe | 2016-10-03 | 1 | -4/+2 |
| * | | | | use QSORT, part 2 | René Scharfe | 2016-09-29 | 2 | -3/+2 |
| * | | | | coccicheck: use --all-includes by default | René Scharfe | 2016-09-29 | 1 | -1/+2 |
| * | | | | remove unnecessary check before QSORT | René Scharfe | 2016-09-29 | 3 | -8/+23 |
| * | | | | use QSORT | René Scharfe | 2016-09-29 | 30 | -65/+44 |
| * | | | | add QSORT | René Scharfe | 2016-09-29 | 2 | -0/+27 |
* | | | | | Eighth batch for 2.11 | Junio C Hamano | 2016-10-06 | 1 | -0/+34 |
* | | | | | Merge branch 'sg/ref-filter-parse-optim' | Junio C Hamano | 2016-10-06 | 1 | -11/+11 |
|\ \ \ \ \ | |||||
| * | | | | | ref-filter: strip format option after a field name only once while parsingsg/ref-filter-parse-optim | SZEDER Gábor | 2016-10-03 | 1 | -11/+11 |
* | | | | | | Merge branch 'rs/cocci' | Junio C Hamano | 2016-10-06 | 6 | -6/+41 |
|\ \ \ \ \ \ | |||||
| * | | | | | | coccicheck: make transformation for strbuf_addf(sb, "...") more precise | René Scharfe | 2016-10-03 | 1 | -3/+26 |
| * | | | | | | use strbuf_add_unique_abbrev() for adding short hashes, part 2 | René Scharfe | 2016-09-27 | 4 | -4/+9 |
| * | | | | | | use strbuf_addstr() instead of strbuf_addf() with "%s", part 2 | René Scharfe | 2016-09-27 | 3 | -2/+8 |
| * | | | | | | gitignore: ignore output files of coccicheck make target | René Scharfe | 2016-09-27 | 1 | -0/+1 |
* | | | | | | | Merge branch 'rs/c-auto-resets-attributes' | Junio C Hamano | 2016-10-06 | 2 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | pretty: avoid adding reset for %C(auto) if output is emptyrs/c-auto-resets-attributes | René Scharfe | 2016-09-29 | 2 | -2/+2 |
* | | | | | | | | Merge branch 'ps/http-gssapi-cred-delegation' | Junio C Hamano | 2016-10-06 | 2 | -0/+51 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | http: control GSSAPI credential delegationps/http-gssapi-cred-delegation | Petr Stodulka | 2016-09-29 | 2 | -0/+51 |
* | | | | | | | | | Merge branch 'jk/graph-padding-fix' | Junio C Hamano | 2016-10-06 | 1 | -4/+12 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | graph: fix extra spaces in graph_padding_linejk/graph-padding-fix | Jeff King | 2016-09-29 | 1 | -4/+12 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'jc/blame-abbrev' | Junio C Hamano | 2016-10-06 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | blame: use DEFAULT_ABBREV macrojc/blame-abbrev | Junio C Hamano | 2016-09-28 | 1 | -1/+1 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'vn/revision-shorthand-for-side-branch-log' | Junio C Hamano | 2016-10-06 | 4 | -19/+180 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | revision: new rev^-n shorthand for rev^n..rev | Vegard Nossum | 2016-09-27 | 4 | -19/+180 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'jk/ambiguous-short-object-names' | Junio C Hamano | 2016-10-06 | 11 | -65/+250 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | get_short_sha1: make default disambiguation configurable | Jeff King | 2016-09-27 | 4 | -0/+51 |
| * | | | | | | | | | get_short_sha1: list ambiguous objects on error | Jeff King | 2016-09-26 | 2 | -2/+72 |
| * | | | | | | | | | for_each_abbrev: drop duplicate objects | Jeff King | 2016-09-26 | 2 | -4/+22 |
| * | | | | | | | | | sha1_array: let callbacks interrupt iteration | Jeff King | 2016-09-26 | 7 | -12/+24 |
| * | | | | | | | | | get_short_sha1: mark ambiguity error for translation | Jeff King | 2016-09-26 | 1 | -1/+1 |
| * | | | | | | | | | get_short_sha1: NUL-terminate hex prefix | Jeff King | 2016-09-26 | 1 | -3/+3 |
| * | | | | | | | | | get_short_sha1: refactor init of disambiguation code | Jeff King | 2016-09-26 | 1 | -44/+35 |
| * | | | | | | | | | get_short_sha1: parse tags when looking for treeish | Jeff King | 2016-09-26 | 2 | -1/+8 |
| * | | | | | | | | | get_sha1: propagate flags to child functions | Jeff King | 2016-09-26 | 2 | -7/+25 |
| * | | | | | | | | | get_sha1: avoid repeating ourselves via ONLY_TO_DIE | Jeff King | 2016-09-26 | 2 | -0/+9 |
| * | | | | | | | | | get_sha1: detect buggy calls with multiple disambiguators | Jeff King | 2016-09-26 | 2 | -0/+9 |
* | | | | | | | | | | Sync with 2.10.1 | Junio C Hamano | 2016-10-03 | 2 | -1/+13 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Git 2.10.1v2.10.1 | Junio C Hamano | 2016-10-03 | 3 | -2/+14 |
| * | | | | | | | | | | Merge branch 'jk/ident-ai-canonname-could-be-null' into maint | Junio C Hamano | 2016-10-03 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/doc-cvs-update' into maint | Junio C Hamano | 2016-10-03 | 2 | -2/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ |