Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | add: modify already added files when --chmod is given | Thomas Gummerer | 2016-09-15 | 6 | -34/+91 | |
| * | | | | | | | | | read-cache: introduce chmod_index_entry | Thomas Gummerer | 2016-09-15 | 3 | -14/+33 | |
| * | | | | | | | | | update-index: add test for chmod flags | Thomas Gummerer | 2016-09-14 | 2 | -1/+14 | |
| * | | | | | | | | | Merge branch 'ib/t3700-add-chmod-x-updates' into tg/add-chmod+x-fix | Junio C Hamano | 2016-09-14 | 1 | -39/+26 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ \ \ \ | Merge branch 'et/add-chmod-x' into maint | Junio C Hamano | 2016-09-29 | 1 | -1/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | add: document the chmod optionet/add-chmod-x | Thomas Gummerer | 2016-09-12 | 1 | -1/+6 | |
* | | | | | | | | | | | Merge branch 'rt/rebase-i-broken-insn-advise' into maint | Junio C Hamano | 2016-09-29 | 2 | -4/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | rebase -i: improve advice on bad instruction linesrt/rebase-i-broken-insn-advise | Ralf Thielow | 2016-09-07 | 2 | -4/+4 | |
* | | | | | | | | | | | | Merge branch 'ls/travis-homebrew-path-fix' into maint | Junio C Hamano | 2016-09-29 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | travis-ci: ask homebrew for its path instead of hardcoding itls/travis-homebrew-path-fix | Lars Schneider | 2016-09-22 | 1 | -1/+1 | |
* | | | | | | | | | | | | | Merge branch 'js/regexec-buf' into maint | Junio C Hamano | 2016-09-29 | 7 | -33/+53 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | regex: use regexec_buf() | Johannes Schindelin | 2016-09-21 | 5 | -33/+17 | |
| * | | | | | | | | | | | | | regex: add regexec_buf() that can work on a non NUL-terminated string | Johannes Schindelin | 2016-09-21 | 2 | -1/+15 | |
| * | | | | | | | | | | | | | regex: -G<pattern> feeds a non NUL-terminated string to regexec() and fails | Johannes Schindelin | 2016-09-21 | 1 | -0/+22 | |
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'nd/checkout-disambiguation' into maint | Junio C Hamano | 2016-09-29 | 4 | -3/+36 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | checkout: fix ambiguity check in subdirnd/checkout-disambiguation | Nguyễn Thái Ngọc Duy | 2016-09-21 | 3 | -2/+23 | |
| * | | | | | | | | | | | | | checkout.txt: document a common case that ignores ambiguation rules | Nguyễn Thái Ngọc Duy | 2016-09-21 | 1 | -0/+12 | |
| * | | | | | | | | | | | | | checkout: add some spaces between code and comment | Nguyễn Thái Ngọc Duy | 2016-09-08 | 1 | -1/+1 | |
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'ep/doc-check-ref-format-example' into maint | Junio C Hamano | 2016-09-29 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | git-check-ref-format.txt: fixup documentationep/doc-check-ref-format-example | Elia Pinto | 2016-09-21 | 1 | -2/+2 | |
* | | | | | | | | | | | | | | Merge branch 'mm/config-color-ui-default-to-auto' into maint | Junio C Hamano | 2016-09-29 | 1 | -6/+12 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Documentation/config: default for color.* is color.uimm/config-color-ui-default-to-auto | Matthieu Moy | 2016-09-16 | 1 | -6/+12 | |
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'jk/reduce-gc-aggressive-depth' into maint | Junio C Hamano | 2016-09-29 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | gc: default aggressive depth to 50jk/reduce-gc-aggressive-depth | Jeff King | 2016-08-11 | 2 | -2/+2 | |
* | | | | | | | | | | | | | | | Merge branch 'jk/rebase-i-drop-ident-check' into maint | Junio C Hamano | 2016-09-29 | 2 | -3/+47 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | rebase-interactive: drop early check for valid identjk/rebase-i-drop-ident-check | Jeff King | 2016-07-29 | 2 | -3/+47 | |
* | | | | | | | | | | | | | | | | Merge branch 'jt/format-patch-base-info-above-sig' into maint | Junio C Hamano | 2016-09-29 | 2 | -9/+30 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | format-patch: show base info before email signaturejt/format-patch-base-info-above-sig | Josh Triplett | 2016-09-15 | 2 | -9/+30 | |
| | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Merge branch 'ks/perf-build-with-autoconf' into maint | Junio C Hamano | 2016-09-29 | 1 | -1/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | t/perf/run: copy config.mak.autogen & friends to build areaks/perf-build-with-autoconf | Kirill Smelkov | 2016-09-15 | 1 | -1/+7 | |
* | | | | | | | | | | | | | | | | | Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context' into maint | Junio C Hamano | 2016-09-29 | 2 | -1/+26 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | xdiff: fix merging of hunks with -W context and -u contextrs/xdiff-merge-overlapping-hunks-for-W-context | René Scharfe | 2016-09-14 | 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 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | http: always remove curl easy from curlm session on releaseew/http-do-not-forget-to-call-curl-multi-remove-handle | Eric Wong | 2016-09-13 | 1 | -4/+6 | |
| * | | | | | | | | | | | | | | | | | | http: consolidate #ifdefs for curl_multi_remove_handle | Eric Wong | 2016-09-13 | 1 | -7/+10 | |
| * | | | | | | | | | | | | | | | | | | http: warn on curl_multi_add_handle failures | Eric Wong | 2016-09-13 | 1 | -0/+2 | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'jk/patch-ids-no-merges' into maint | Junio C Hamano | 2016-09-29 | 1 | -0/+16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | patch-ids: refuse to compute patch-id for merge commitjk/patch-ids-no-merges | Jeff King | 2016-09-12 | 1 | -0/+15 | |
| * | | | | | | | | | | | | | | | | | | | patch-ids: turn off rename detection | Jeff King | 2016-09-09 | 1 | -0/+1 | |
| | |_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'js/git-gui-commit-gpgsign' into maint | Junio C Hamano | 2016-09-29 | 1 | -0/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'js/commit-gpgsign' of ../git-gui into js/git-gui-commit-gpgsignjs/git-gui-commit-gpgsign | Junio C Hamano | 2016-09-11 | 1 | -0/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | git-gui: respect commit.gpgsign again | Johannes Schindelin | 2016-09-11 | 1 | -0/+3 | |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'jk/fix-remote-curl-url-wo-proto' into maint | Junio C Hamano | 2016-09-29 | 2 | -1/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | remote-curl: handle URLs without protocoljk/fix-remote-curl-url-wo-proto | Jeff King | 2016-09-08 | 2 | -1/+9 | |
| | |_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'sy/git-gui-i18n-ja' into maint | Junio C Hamano | 2016-09-29 | 1 | -1309/+1438 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sy/i18n' of git-guisy/git-gui-i18n-ja | Junio C Hamano | 2016-09-07 | 1 | -1309/+1438 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | git-gui: update Japanese information | Satoshi Yasushima | 2016-09-07 | 1 | -2/+4 | |
| | * | | | | | | | | | | | | | | | | | | git-gui: update Japanese translation | Satoshi Yasushima | 2016-09-07 | 1 | -42/+35 | |
| | * | | | | | | | | | | | | | | | | | | git-gui: add Japanese language code | Satoshi Yasushima | 2016-09-07 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | | | | | | | git-gui: apply po template to Japanese translation | Satoshi Yasushima | 2016-09-07 | 1 | -1304/+1437 |