summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge branch 'rs/qsort'Junio C Hamano2016-10-1035-78/+97
|\ \ \ \ \ \
| * | | | | | show-branch: use QSORTrs/qsortRené Scharfe2016-10-031-4/+2
| * | | | | | use QSORT, part 2René Scharfe2016-09-292-3/+2
| * | | | | | coccicheck: use --all-includes by defaultRené Scharfe2016-09-291-1/+2
| * | | | | | remove unnecessary check before QSORTRené Scharfe2016-09-293-8/+23
| * | | | | | use QSORTRené Scharfe2016-09-2930-65/+44
| * | | | | | add QSORTRené Scharfe2016-09-292-0/+27
* | | | | | | Eighth batch for 2.11Junio C Hamano2016-10-061-0/+34
* | | | | | | Merge branch 'sg/ref-filter-parse-optim'Junio C Hamano2016-10-061-11/+11
|\ \ \ \ \ \ \
| * | | | | | | ref-filter: strip format option after a field name only once while parsingsg/ref-filter-parse-optimSZEDER Gábor2016-10-031-11/+11
* | | | | | | | Merge branch 'rs/cocci'Junio C Hamano2016-10-066-6/+41
|\ \ \ \ \ \ \ \
| * | | | | | | | coccicheck: make transformation for strbuf_addf(sb, "...") more preciseRené Scharfe2016-10-031-3/+26
| * | | | | | | | use strbuf_add_unique_abbrev() for adding short hashes, part 2René Scharfe2016-09-274-4/+9
| * | | | | | | | use strbuf_addstr() instead of strbuf_addf() with "%s", part 2René Scharfe2016-09-273-2/+8
| * | | | | | | | gitignore: ignore output files of coccicheck make targetRené Scharfe2016-09-271-0/+1
* | | | | | | | | Merge branch 'rs/c-auto-resets-attributes'Junio C Hamano2016-10-062-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | pretty: avoid adding reset for %C(auto) if output is emptyrs/c-auto-resets-attributesRené Scharfe2016-09-292-2/+2
* | | | | | | | | | Merge branch 'ps/http-gssapi-cred-delegation'Junio C Hamano2016-10-062-0/+51
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | http: control GSSAPI credential delegationps/http-gssapi-cred-delegationPetr Stodulka2016-09-292-0/+51
* | | | | | | | | | | Merge branch 'jk/graph-padding-fix'Junio C Hamano2016-10-061-4/+12
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | graph: fix extra spaces in graph_padding_linejk/graph-padding-fixJeff King2016-09-291-4/+12
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jc/blame-abbrev'Junio C Hamano2016-10-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | blame: use DEFAULT_ABBREV macrojc/blame-abbrevJunio C Hamano2016-09-281-1/+1
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'vn/revision-shorthand-for-side-branch-log'Junio C Hamano2016-10-064-19/+180
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | revision: new rev^-n shorthand for rev^n..revVegard Nossum2016-09-274-19/+180
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'jk/ambiguous-short-object-names'Junio C Hamano2016-10-0611-65/+250
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | get_short_sha1: make default disambiguation configurableJeff King2016-09-274-0/+51
| * | | | | | | | | | | get_short_sha1: list ambiguous objects on errorJeff King2016-09-262-2/+72
| * | | | | | | | | | | for_each_abbrev: drop duplicate objectsJeff King2016-09-262-4/+22
| * | | | | | | | | | | sha1_array: let callbacks interrupt iterationJeff King2016-09-267-12/+24
| * | | | | | | | | | | get_short_sha1: mark ambiguity error for translationJeff King2016-09-261-1/+1
| * | | | | | | | | | | get_short_sha1: NUL-terminate hex prefixJeff King2016-09-261-3/+3
| * | | | | | | | | | | get_short_sha1: refactor init of disambiguation codeJeff King2016-09-261-44/+35
| * | | | | | | | | | | get_short_sha1: parse tags when looking for treeishJeff King2016-09-262-1/+8
| * | | | | | | | | | | get_sha1: propagate flags to child functionsJeff King2016-09-262-7/+25
| * | | | | | | | | | | get_sha1: avoid repeating ourselves via ONLY_TO_DIEJeff King2016-09-262-0/+9
| * | | | | | | | | | | get_sha1: detect buggy calls with multiple disambiguatorsJeff King2016-09-262-0/+9
* | | | | | | | | | | | Sync with 2.10.1Junio C Hamano2016-10-032-1/+13
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Git 2.10.1v2.10.1Junio C Hamano2016-10-033-2/+14
| * | | | | | | | | | | | Merge branch 'jk/ident-ai-canonname-could-be-null' into maintJunio C Hamano2016-10-031-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/doc-cvs-update' into maintJunio C Hamano2016-10-032-2/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/pack-tag-of-tag' into maintJunio C Hamano2016-10-032-30/+95
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Seventh batch for 2.11Junio C Hamano2016-10-031-0/+40
* | | | | | | | | | | | | | | Merge branch 'pb/rev-list-reverse-with-count'Junio C Hamano2016-10-031-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | rev-list-options: clarify the usage of --reversepb/rev-list-reverse-with-countPranit Bauva2016-09-271-2/+3
| | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'dt/tree-fsck'Junio C Hamano2016-10-035-20/+130
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | fsck: handle bad trees like other errorsdt/tree-fsckDavid Turner2016-09-274-19/+106
| * | | | | | | | | | | | | | | tree-walk: be more specific about corrupt tree errorsJeff King2016-09-272-7/+30
| | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'kd/mailinfo-quoted-string'Junio C Hamano2016-10-036-33/+159
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | mailinfo: unescape quoted-pair in header fieldskd/mailinfo-quoted-stringKevin Daudt2016-09-286-0/+124
View Lorry Controller Status