aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context' into maintJunio C Hamano2016-09-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ew/http-do-not-forget-to-call-curl-multi-remove-handle' into maintJunio C Hamano2016-09-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/patch-ids-no-merges' into maintJunio C Hamano2016-09-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/git-gui-commit-gpgsign' into maintJunio C Hamano2016-09-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/fix-remote-curl-url-wo-proto' into maintJunio C Hamano2016-09-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sy/git-gui-i18n-ja' into maintJunio C Hamano2016-09-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mr/vcs-svn-printf-ulong' into maintJunio C Hamano2016-09-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/unpack-trees-reduce-file-scope-global' into maintJunio C Hamano2016-09-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/strbuf-remove-fix' into maintJunio C Hamano2016-09-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rs/checkout-some-states-are-const' into maintJunio C Hamano2016-09-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bw/pathspec-remove-unused-extern-decl' into maintJunio C Hamano2016-09-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | Sixth batch for 2.11Junio C Hamano2016-09-29
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/worktree-config'Junio C Hamano2016-09-29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | worktree: honor configuration variablesJunio C Hamano2016-09-27
| |/ / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/ident-ai-canonname-could-be-null'Junio C Hamano2016-09-29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | ident: handle NULL ai_canonnameJeff King2016-09-23
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jt/fetch-pack-in-vain-count-with-stateless'Junio C Hamano2016-09-29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | fetch-pack: do not reset in_vain on non-novel acksJonathan Tan2016-09-23
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/verify-packfile-gently'Junio C Hamano2016-09-29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | verify_packfile: check pack validity before accessing dataJeff King2016-09-22
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jt/mailinfo-fold-in-body-headers'Junio C Hamano2016-09-29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | mailinfo: handle in-body header continuationsJonathan Tan2016-09-21
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | mailinfo: make is_scissors_line take plain char *Jonathan Tan2016-09-19
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | mailinfo: separate in-body header processingJonathan Tan2016-09-19
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fifth batch for 2.11Junio C Hamano2016-09-26
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/clone-recursive-progress'Junio C Hamano2016-09-26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | clone: pass --progress decision to recursive submodulesJeff King2016-09-22
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/doc-cvs-update'Junio C Hamano2016-09-26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | docs/cvs-migration: mention cvsimport caveatsJeff King2016-09-22
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | docs/cvs-migration: update link to cvsps homepageJeff King2016-09-22