summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* rev-parse: fix parent shorthands with --symbolicjk/rev-parse-symbolic-parents-fixJeff King2016-11-162-1/+24
* 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
| * | | | | | | | t5100-mailinfo: replace common path prefix with variableKevin Daudt2016-09-281-33/+35
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'mh/diff-indent-heuristic'Junio C Hamano2016-10-031-7/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | xdiff: rename "struct group" to "struct xdlgroup"mh/diff-indent-heuristicJeff King2016-09-271-7/+7
* | | | | | | | | Merge branch 'dt/mailinfo'Junio C Hamano2016-10-031-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | add David Turner's Two Sigma addressdt/mailinfoDavid Turner2016-09-261-0/+1
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'va/git-gui-i18n'Junio C Hamano2016-10-033-3/+3012
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'va/i18n' of ../git-gui into va/git-gui-i18nva/git-gui-i18nJunio C Hamano2016-09-263-3/+3012
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| | * | | | | | | | git-gui: l10n: add Portuguese translationVasco Almeida2016-09-262-0/+3009
| | * | | | | | | | git-gui i18n: mark strings for translationVasco Almeida2016-09-261-3/+3
* | | | | | | | | | Merge branch 'rs/git-gui-use-modern-git-merge-syntax'Junio C Hamano2016-10-031-6/+1
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'rs/use-modern-git-merge-syntax' of git-gui into rs/git-gui-use-...rs/git-gui-use-modern-git-merge-syntaxJunio C Hamano2016-09-261-6/+1
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| | * | | | | | | | | git-gui: stop using deprecated merge syntaxRené Scharfe2016-09-261-6/+1
| | | |/ / / / / / / | | |/| | | | | | |
* | | | | | | | | | Merge branch 'jc/verify-loose-object-header'Junio C Hamano2016-10-032-8/+30
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | unpack_sha1_header(): detect malformed object headerjc/verify-loose-object-headerJunio C Hamano2016-09-261-2/+24
| * | | | | | | | | | streaming: make sure to notice corrupt objectJunio C Hamano2016-09-261-6/+6
* | | | | | | | | | | Merge branch 'nd/init-core-worktree-in-multi-worktree-world'Junio C Hamano2016-10-034-50/+57
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | init: kill git_link variablend/init-core-worktree-in-multi-worktree-worldNguyễn Thái Ngọc Duy2016-09-251-12/+4
| * | | | | | | | | | | init: do not set unnecessary core.worktreeNguyễn Thái Ngọc Duy2016-09-252-3/+8
| * | | | | | | | | | | init: kill set_git_dir_init()Nguyễn Thái Ngọc Duy2016-09-251-29/+21
| * | | | | | | | | | | init: call set_git_dir_init() from within init_db()Nguyễn Thái Ngọc Duy2016-09-253-17/+21
| * | | | | | | | | | | init: correct re-initialization from a linked worktreeNguyễn Thái Ngọc Duy2016-09-252-1/+16
* | | | | | | | | | | | Merge branch 'ik/gitweb-force-highlight'Junio C Hamano2016-10-033-14/+29
|\ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status