aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| * | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | git-gui: stop using deprecated merge syntaxRené Scharfe2016-09-26
| | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'jc/verify-loose-object-header'Junio C Hamano2016-10-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | unpack_sha1_header(): detect malformed object headerJunio C Hamano2016-09-26
| * | | | | | | | | | | | | | | streaming: make sure to notice corrupt objectJunio C Hamano2016-09-26
* | | | | | | | | | | | | | | | Merge branch 'nd/init-core-worktree-in-multi-worktree-world'Junio C Hamano2016-10-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | init: kill git_link variableNguyễn Thái Ngọc Duy2016-09-25
| * | | | | | | | | | | | | | | | init: do not set unnecessary core.worktreeNguyễn Thái Ngọc Duy2016-09-25
| * | | | | | | | | | | | | | | | init: kill set_git_dir_init()Nguyễn Thái Ngọc Duy2016-09-25
| * | | | | | | | | | | | | | | | init: call set_git_dir_init() from within init_db()Nguyễn Thái Ngọc Duy2016-09-25
| * | | | | | | | | | | | | | | | init: correct re-initialization from a linked worktreeNguyễn Thái Ngọc Duy2016-09-25
* | | | | | | | | | | | | | | | | Merge branch 'ik/gitweb-force-highlight'Junio C Hamano2016-10-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | gitweb: use highlight's shebang detectionIan Kelling2016-09-25
| * | | | | | | | | | | | | | | | | gitweb: remove unused guess_file_syntax() parameterIan Kelling2016-09-25
| | |_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'rs/copy-array'Junio C Hamano2016-10-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | use COPY_ARRAYRené Scharfe2016-09-25
| * | | | | | | | | | | | | | | | | add COPY_ARRAYRené Scharfe2016-09-25
* | | | | | | | | | | | | | | | | | Sync with maintJunio C Hamano2016-09-29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Prepare for 2.10.1Junio C Hamano2016-09-29
| * | | | | | | | | | | | | | | | | Merge branch 'tg/add-chmod+x-fix' into maintJunio C Hamano2016-09-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'et/add-chmod-x' into maintJunio C Hamano2016-09-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rt/rebase-i-broken-insn-advise' into maintJunio C Hamano2016-09-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ls/travis-homebrew-path-fix' into maintJunio C Hamano2016-09-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/regexec-buf' into maintJunio C Hamano2016-09-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/checkout-disambiguation' into maintJunio C Hamano2016-09-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ep/doc-check-ref-format-example' into maintJunio C Hamano2016-09-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mm/config-color-ui-default-to-auto' into maintJunio C Hamano2016-09-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/reduce-gc-aggressive-depth' into maintJunio C Hamano2016-09-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/rebase-i-drop-ident-check' into maintJunio C Hamano2016-09-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jt/format-patch-base-info-above-sig' into maintJunio C Hamano2016-09-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ks/perf-build-with-autoconf' into maintJunio C Hamano2016-09-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \