Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | xdiff: rename "struct group" to "struct xdlgroup"mh/diff-indent-heuristic | Jeff King | 2016-09-27 | 1 | -7/+7 | |
* | | | | | | | | | | | Merge branch 'dt/mailinfo' | Junio C Hamano | 2016-10-03 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | add David Turner's Two Sigma addressdt/mailinfo | David Turner | 2016-09-26 | 1 | -0/+1 | |
| | |/ / / / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'va/git-gui-i18n' | Junio C Hamano | 2016-10-03 | 3 | -3/+3012 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'va/i18n' of ../git-gui into va/git-gui-i18nva/git-gui-i18n | Junio C Hamano | 2016-09-26 | 3 | -3/+3012 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | git-gui: l10n: add Portuguese translation | Vasco Almeida | 2016-09-26 | 2 | -0/+3009 | |
| | * | | | | | | | | | | git-gui i18n: mark strings for translation | Vasco Almeida | 2016-09-26 | 1 | -3/+3 | |
* | | | | | | | | | | | | Merge branch 'rs/git-gui-use-modern-git-merge-syntax' | Junio C Hamano | 2016-10-03 | 1 | -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-syntax | Junio C Hamano | 2016-09-26 | 1 | -6/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | git-gui: stop using deprecated merge syntax | René Scharfe | 2016-09-26 | 1 | -6/+1 | |
| | | |/ / / / / / / / / | | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'jc/verify-loose-object-header' | Junio C Hamano | 2016-10-03 | 2 | -8/+30 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | unpack_sha1_header(): detect malformed object headerjc/verify-loose-object-header | Junio C Hamano | 2016-09-26 | 1 | -2/+24 | |
| * | | | | | | | | | | | | streaming: make sure to notice corrupt object | Junio C Hamano | 2016-09-26 | 1 | -6/+6 | |
* | | | | | | | | | | | | | Merge branch 'nd/init-core-worktree-in-multi-worktree-world' | Junio C Hamano | 2016-10-03 | 4 | -50/+57 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | init: kill git_link variablend/init-core-worktree-in-multi-worktree-world | Nguyễn Thái Ngọc Duy | 2016-09-25 | 1 | -12/+4 | |
| * | | | | | | | | | | | | | init: do not set unnecessary core.worktree | Nguyễn Thái Ngọc Duy | 2016-09-25 | 2 | -3/+8 | |
| * | | | | | | | | | | | | | init: kill set_git_dir_init() | Nguyễn Thái Ngọc Duy | 2016-09-25 | 1 | -29/+21 | |
| * | | | | | | | | | | | | | init: call set_git_dir_init() from within init_db() | Nguyễn Thái Ngọc Duy | 2016-09-25 | 3 | -17/+21 | |
| * | | | | | | | | | | | | | init: correct re-initialization from a linked worktree | Nguyễn Thái Ngọc Duy | 2016-09-25 | 2 | -1/+16 | |
* | | | | | | | | | | | | | | Merge branch 'ik/gitweb-force-highlight' | Junio C Hamano | 2016-10-03 | 3 | -14/+29 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | gitweb: use highlight's shebang detectionik/gitweb-force-highlight | Ian Kelling | 2016-09-25 | 3 | -12/+27 | |
| * | | | | | | | | | | | | | | gitweb: remove unused guess_file_syntax() parameter | Ian Kelling | 2016-09-25 | 1 | -2/+2 | |
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'rs/copy-array' | Junio C Hamano | 2016-10-03 | 7 | -9/+40 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | use COPY_ARRAYrs/copy-array | René Scharfe | 2016-09-25 | 6 | -9/+32 | |
| * | | | | | | | | | | | | | | add COPY_ARRAY | René Scharfe | 2016-09-25 | 1 | -0/+8 | |
* | | | | | | | | | | | | | | | Sync with maint | Junio C Hamano | 2016-09-29 | 1 | -0/+87 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Prepare for 2.10.1 | Junio C Hamano | 2016-09-29 | 1 | -0/+87 | |
| * | | | | | | | | | | | | | | Merge branch 'tg/add-chmod+x-fix' into maint | Junio C Hamano | 2016-09-29 | 8 | -49/+136 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'et/add-chmod-x' into maint | Junio C Hamano | 2016-09-29 | 1 | -1/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rt/rebase-i-broken-insn-advise' into maint | Junio C Hamano | 2016-09-29 | 2 | -4/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ls/travis-homebrew-path-fix' into maint | Junio C Hamano | 2016-09-29 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/regexec-buf' into maint | Junio C Hamano | 2016-09-29 | 7 | -33/+53 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/checkout-disambiguation' into maint | Junio C Hamano | 2016-09-29 | 4 | -3/+36 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ep/doc-check-ref-format-example' into maint | Junio C Hamano | 2016-09-29 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mm/config-color-ui-default-to-auto' into maint | Junio C Hamano | 2016-09-29 | 1 | -6/+12 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/reduce-gc-aggressive-depth' into maint | Junio C Hamano | 2016-09-29 | 2 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/rebase-i-drop-ident-check' into maint | Junio C Hamano | 2016-09-29 | 2 | -3/+47 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jt/format-patch-base-info-above-sig' into maint | Junio C Hamano | 2016-09-29 | 2 | -9/+30 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ks/perf-build-with-autoconf' into maint | Junio C Hamano | 2016-09-29 | 1 | -1/+7 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context' into maint | Junio C Hamano | 2016-09-29 | 2 | -1/+26 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'ew/http-do-not-forget-to-call-curl-multi-remove-handle' into maint | Junio C Hamano | 2016-09-29 | 1 | -11/+18 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/patch-ids-no-merges' into maint | Junio C Hamano | 2016-09-29 | 1 | -0/+16 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/git-gui-commit-gpgsign' into maint | Junio C Hamano | 2016-09-29 | 1 | -0/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jk/fix-remote-curl-url-wo-proto' into maint | Junio C Hamano | 2016-09-29 | 2 | -1/+9 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sy/git-gui-i18n-ja' into maint | Junio C Hamano | 2016-09-29 | 1 | -1309/+1438 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mr/vcs-svn-printf-ulong' into maint | Junio C Hamano | 2016-09-29 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/unpack-trees-reduce-file-scope-global' into maint | Junio C Hamano | 2016-09-29 | 1 | -4/+5 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/strbuf-remove-fix' into maint | Junio C Hamano | 2016-09-29 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'rs/checkout-some-states-are-const' into maint | Junio C Hamano | 2016-09-29 | 1 | -3/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'bw/pathspec-remove-unused-extern-decl' into maint | Junio C Hamano | 2016-09-29 | 1 | -2/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |