aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| * | | | | | | | coccicheck: make transformation for strbuf_addf(sb, "...") more preciseRené Scharfe2016-10-03
| * | | | | | | | use strbuf_add_unique_abbrev() for adding short hashes, part 2René Scharfe2016-09-27
| * | | | | | | | use strbuf_addstr() instead of strbuf_addf() with "%s", part 2René Scharfe2016-09-27
| * | | | | | | | gitignore: ignore output files of coccicheck make targetRené Scharfe2016-09-27
* | | | | | | | | Merge branch 'rs/c-auto-resets-attributes'Junio C Hamano2016-10-06
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | pretty: avoid adding reset for %C(auto) if output is emptyRené Scharfe2016-09-29
* | | | | | | | | | Merge branch 'ps/http-gssapi-cred-delegation'Junio C Hamano2016-10-06
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | http: control GSSAPI credential delegationPetr Stodulka2016-09-29
* | | | | | | | | | | Merge branch 'jk/graph-padding-fix'Junio C Hamano2016-10-06
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | graph: fix extra spaces in graph_padding_lineJeff King2016-09-29
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jc/blame-abbrev'Junio C Hamano2016-10-06
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | blame: use DEFAULT_ABBREV macroJunio C Hamano2016-09-28
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'vn/revision-shorthand-for-side-branch-log'Junio C Hamano2016-10-06
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | revision: new rev^-n shorthand for rev^n..revVegard Nossum2016-09-27
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'jk/ambiguous-short-object-names'Junio C Hamano2016-10-06
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | get_short_sha1: make default disambiguation configurableJeff King2016-09-27
| * | | | | | | | | | | get_short_sha1: list ambiguous objects on errorJeff King2016-09-26
| * | | | | | | | | | | for_each_abbrev: drop duplicate objectsJeff King2016-09-26
| * | | | | | | | | | | sha1_array: let callbacks interrupt iterationJeff King2016-09-26
| * | | | | | | | | | | get_short_sha1: mark ambiguity error for translationJeff King2016-09-26
| * | | | | | | | | | | get_short_sha1: NUL-terminate hex prefixJeff King2016-09-26
| * | | | | | | | | | | get_short_sha1: refactor init of disambiguation codeJeff King2016-09-26
| * | | | | | | | | | | get_short_sha1: parse tags when looking for treeishJeff King2016-09-26
| * | | | | | | | | | | get_sha1: propagate flags to child functionsJeff King2016-09-26
| * | | | | | | | | | | get_sha1: avoid repeating ourselves via ONLY_TO_DIEJeff King2016-09-26
| * | | | | | | | | | | get_sha1: detect buggy calls with multiple disambiguatorsJeff King2016-09-26
* | | | | | | | | | | | Sync with 2.10.1Junio C Hamano2016-10-03
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Git 2.10.1v2.10.1Junio C Hamano2016-10-03
| * | | | | | | | | | | | Merge branch 'jk/ident-ai-canonname-could-be-null' into maintJunio C Hamano2016-10-03
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/doc-cvs-update' into maintJunio C Hamano2016-10-03
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/pack-tag-of-tag' into maintJunio C Hamano2016-10-03
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Seventh batch for 2.11Junio C Hamano2016-10-03
* | | | | | | | | | | | | | | Merge branch 'pb/rev-list-reverse-with-count'Junio C Hamano2016-10-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | rev-list-options: clarify the usage of --reversePranit Bauva2016-09-27
| | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'dt/tree-fsck'Junio C Hamano2016-10-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | fsck: handle bad trees like other errorsDavid Turner2016-09-27
| * | | | | | | | | | | | | | | tree-walk: be more specific about corrupt tree errorsJeff King2016-09-27
| | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'kd/mailinfo-quoted-string'Junio C Hamano2016-10-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | mailinfo: unescape quoted-pair in header fieldsKevin Daudt2016-09-28
| * | | | | | | | | | | | | | | t5100-mailinfo: replace common path prefix with variableKevin Daudt2016-09-28
| | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'mh/diff-indent-heuristic'Junio C Hamano2016-10-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | xdiff: rename "struct group" to "struct xdlgroup"Jeff King2016-09-27
* | | | | | | | | | | | | | | | Merge branch 'dt/mailinfo'Junio C Hamano2016-10-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | add David Turner's Two Sigma addressDavid Turner2016-09-26
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'va/git-gui-i18n'Junio C Hamano2016-10-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'va/i18n' of ../git-gui into va/git-gui-i18nJunio C Hamano2016-09-26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | git-gui: l10n: add Portuguese translationVasco Almeida2016-09-26
| | * | | | | | | | | | | | | | | git-gui i18n: mark strings for translationVasco Almeida2016-09-26
* | | | | | | | | | | | | | | | | Merge branch 'rs/git-gui-use-modern-git-merge-syntax'Junio C Hamano2016-10-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/use-modern-git-merge-syntax' of git-gui into rs/git-gui-use-...Junio C Hamano2016-09-26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |