Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | 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 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sixth batch for 2.11 | Junio C Hamano | 2016-09-29 | 1 | -0/+28 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/worktree-config' | Junio C Hamano | 2016-09-29 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | worktree: honor configuration variablesjc/worktree-config | Junio C Hamano | 2016-09-27 | 1 | -0/+2 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/ident-ai-canonname-could-be-null' | Junio C Hamano | 2016-09-29 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ident: handle NULL ai_canonnamejk/ident-ai-canonname-could-be-null | Jeff King | 2016-09-23 | 1 | -1/+1 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jt/fetch-pack-in-vain-count-with-stateless' | Junio C Hamano | 2016-09-29 | 1 | -2/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fetch-pack: do not reset in_vain on non-novel acksjt/fetch-pack-in-vain-count-with-stateless | Jonathan Tan | 2016-09-23 | 1 | -2/+9 | |
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/verify-packfile-gently' | Junio C Hamano | 2016-09-29 | 1 | -5/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | verify_packfile: check pack validity before accessing datajk/verify-packfile-gently | Jeff King | 2016-09-22 | 1 | -5/+2 | |
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jt/mailinfo-fold-in-body-headers' | Junio C Hamano | 2016-09-29 | 12 | -36/+159 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mailinfo: handle in-body header continuations | Jonathan Tan | 2016-09-21 | 12 | -4/+125 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mailinfo: make is_scissors_line take plain char * | Jonathan Tan | 2016-09-19 | 1 | -17/+18 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mailinfo: separate in-body header processing | Jonathan Tan | 2016-09-19 | 1 | -16/+17 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fifth batch for 2.11 | Junio C Hamano | 2016-09-26 | 1 | -0/+66 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/clone-recursive-progress' | Junio C Hamano | 2016-09-26 | 3 | -5/+34 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clone: pass --progress decision to recursive submodulesjk/clone-recursive-progress | Jeff King | 2016-09-22 | 3 | -5/+34 |