Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'tg/add-chmod+x-fix' into maint | Junio C Hamano | 2016-09-29 |
|\ | |||
| * | t3700-add: do not check working tree file mode without POSIXPERM | Johannes Sixt | 2016-09-21 |
| * | t3700-add: create subdirectory gently | Johannes Sixt | 2016-09-21 |
| * | add: modify already added files when --chmod is given | Thomas Gummerer | 2016-09-15 |
| * | read-cache: introduce chmod_index_entry | Thomas Gummerer | 2016-09-15 |
| * | update-index: add test for chmod flags | Thomas Gummerer | 2016-09-14 |
| * | Merge branch 'ib/t3700-add-chmod-x-updates' into tg/add-chmod+x-fix | Junio C Hamano | 2016-09-14 |
| |\ | |||
* | \ | Merge branch 'et/add-chmod-x' into maint | Junio C Hamano | 2016-09-29 |
|\ \ \ | |/ / | |||
| * | | add: document the chmod option | Thomas Gummerer | 2016-09-12 |
* | | | Merge branch 'rt/rebase-i-broken-insn-advise' into maint | Junio C Hamano | 2016-09-29 |
|\ \ \ | |||
| * | | | rebase -i: improve advice on bad instruction lines | Ralf Thielow | 2016-09-07 |
* | | | | Merge branch 'ls/travis-homebrew-path-fix' into maint | Junio C Hamano | 2016-09-29 |
|\ \ \ \ | |||
| * | | | | travis-ci: ask homebrew for its path instead of hardcoding it | Lars Schneider | 2016-09-22 |
* | | | | | Merge branch 'js/regexec-buf' into maint | Junio C Hamano | 2016-09-29 |
|\ \ \ \ \ | |||
| * | | | | | regex: use regexec_buf() | Johannes Schindelin | 2016-09-21 |
| * | | | | | regex: add regexec_buf() that can work on a non NUL-terminated string | Johannes Schindelin | 2016-09-21 |
| * | | | | | regex: -G<pattern> feeds a non NUL-terminated string to regexec() and fails | Johannes Schindelin | 2016-09-21 |
* | | | | | | Merge branch 'nd/checkout-disambiguation' into maint | Junio C Hamano | 2016-09-29 |
|\ \ \ \ \ \ | |||
| * | | | | | | checkout: fix ambiguity check in subdir | Nguyễn Thái Ngọc Duy | 2016-09-21 |
| * | | | | | | checkout.txt: document a common case that ignores ambiguation rules | Nguyễn Thái Ngọc Duy | 2016-09-21 |
| * | | | | | | checkout: add some spaces between code and comment | Nguyễn Thái Ngọc Duy | 2016-09-08 |
| | |_|/ / / | |/| | | | | |||
* | | | | | | Merge branch 'ep/doc-check-ref-format-example' into maint | Junio C Hamano | 2016-09-29 |
|\ \ \ \ \ \ | |||
| * | | | | | | git-check-ref-format.txt: fixup documentation | Elia Pinto | 2016-09-21 |
* | | | | | | | Merge branch 'mm/config-color-ui-default-to-auto' into maint | Junio C Hamano | 2016-09-29 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | Documentation/config: default for color.* is color.ui | Matthieu Moy | 2016-09-16 |
| | |_|/ / / / | |/| | | | | | |||
* | | | | | | | Merge branch 'jk/reduce-gc-aggressive-depth' into maint | Junio C Hamano | 2016-09-29 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | gc: default aggressive depth to 50 | Jeff King | 2016-08-11 |
* | | | | | | | | Merge branch 'jk/rebase-i-drop-ident-check' into maint | Junio C Hamano | 2016-09-29 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | rebase-interactive: drop early check for valid ident | Jeff King | 2016-07-29 |
* | | | | | | | | | Merge branch 'jt/format-patch-base-info-above-sig' into maint | Junio C Hamano | 2016-09-29 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | format-patch: show base info before email signature | Josh Triplett | 2016-09-15 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||
* | | | | | | | | | Merge branch 'ks/perf-build-with-autoconf' into maint | Junio C Hamano | 2016-09-29 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | t/perf/run: copy config.mak.autogen & friends to build area | Kirill Smelkov | 2016-09-15 |
* | | | | | | | | | | Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context' into maint | Junio C Hamano | 2016-09-29 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | xdiff: fix merging of hunks with -W context and -u context | René Scharfe | 2016-09-14 |
* | | | | | | | | | | | Merge branch 'ew/http-do-not-forget-to-call-curl-multi-remove-handle' into maint | Junio C Hamano | 2016-09-29 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | http: always remove curl easy from curlm session on release | Eric Wong | 2016-09-13 |
| * | | | | | | | | | | | http: consolidate #ifdefs for curl_multi_remove_handle | Eric Wong | 2016-09-13 |
| * | | | | | | | | | | | http: warn on curl_multi_add_handle failures | Eric Wong | 2016-09-13 |
* | | | | | | | | | | | | Merge branch 'jk/patch-ids-no-merges' into maint | Junio C Hamano | 2016-09-29 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | patch-ids: refuse to compute patch-id for merge commit | Jeff King | 2016-09-12 |
| * | | | | | | | | | | | | patch-ids: turn off rename detection | Jeff King | 2016-09-09 |
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | |||
* | | | | | | | | | | | | Merge branch 'js/git-gui-commit-gpgsign' into maint | Junio C Hamano | 2016-09-29 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/commit-gpgsign' of ../git-gui into js/git-gui-commit-gpgsign | Junio C Hamano | 2016-09-11 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |||
| | * | | | | | | | | | | | git-gui: respect commit.gpgsign again | Johannes Schindelin | 2016-09-11 |
* | | | | | | | | | | | | | Merge branch 'jk/fix-remote-curl-url-wo-proto' into maint | Junio C Hamano | 2016-09-29 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | remote-curl: handle URLs without protocol | Jeff King | 2016-09-08 |
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | |||
* | | | | | | | | | | | | | Merge branch 'sy/git-gui-i18n-ja' into maint | Junio C Hamano | 2016-09-29 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sy/i18n' of git-gui | Junio C Hamano | 2016-09-07 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | |||
| | * | | | | | | | | | | | | git-gui: update Japanese information | Satoshi Yasushima | 2016-09-07 |