summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* ref-filter: strip format option after a field name only once while parsingsg/ref-filter-parse-optimSZEDER Gábor2016-10-031-11/+11
* Prepare for 2.10.1Junio C Hamano2016-09-291-0/+87
* Merge branch 'tg/add-chmod+x-fix' into maintJunio C Hamano2016-09-298-49/+136
|\
| * t3700-add: do not check working tree file mode without POSIXPERMJohannes Sixt2016-09-211-4/+2
| * t3700-add: create subdirectory gentlyJohannes Sixt2016-09-211-1/+1
| * add: modify already added files when --chmod is givenThomas Gummerer2016-09-156-34/+91
| * read-cache: introduce chmod_index_entryThomas Gummerer2016-09-153-14/+33
| * update-index: add test for chmod flagsThomas Gummerer2016-09-142-1/+14
| * Merge branch 'ib/t3700-add-chmod-x-updates' into tg/add-chmod+x-fixJunio C Hamano2016-09-141-39/+26
| |\
* | \ Merge branch 'et/add-chmod-x' into maintJunio C Hamano2016-09-291-1/+6
|\ \ \ | |/ /
| * | add: document the chmod optionet/add-chmod-xThomas Gummerer2016-09-121-1/+6
* | | Merge branch 'rt/rebase-i-broken-insn-advise' into maintJunio C Hamano2016-09-292-4/+4
|\ \ \
| * | | rebase -i: improve advice on bad instruction linesrt/rebase-i-broken-insn-adviseRalf Thielow2016-09-072-4/+4
* | | | Merge branch 'ls/travis-homebrew-path-fix' into maintJunio C Hamano2016-09-291-1/+1
|\ \ \ \
| * | | | travis-ci: ask homebrew for its path instead of hardcoding itls/travis-homebrew-path-fixLars Schneider2016-09-221-1/+1
* | | | | Merge branch 'js/regexec-buf' into maintJunio C Hamano2016-09-297-33/+53
|\ \ \ \ \
| * | | | | regex: use regexec_buf()Johannes Schindelin2016-09-215-33/+17
| * | | | | regex: add regexec_buf() that can work on a non NUL-terminated stringJohannes Schindelin2016-09-212-1/+15
| * | | | | regex: -G<pattern> feeds a non NUL-terminated string to regexec() and failsJohannes Schindelin2016-09-211-0/+22
* | | | | | Merge branch 'nd/checkout-disambiguation' into maintJunio C Hamano2016-09-294-3/+36
|\ \ \ \ \ \
| * | | | | | checkout: fix ambiguity check in subdirnd/checkout-disambiguationNguyễn Thái Ngọc Duy2016-09-213-2/+23
| * | | | | | checkout.txt: document a common case that ignores ambiguation rulesNguyễn Thái Ngọc Duy2016-09-211-0/+12
| * | | | | | checkout: add some spaces between code and commentNguyễn Thái Ngọc Duy2016-09-081-1/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'ep/doc-check-ref-format-example' into maintJunio C Hamano2016-09-291-2/+2
|\ \ \ \ \ \
| * | | | | | git-check-ref-format.txt: fixup documentationep/doc-check-ref-format-exampleElia Pinto2016-09-211-2/+2
* | | | | | | Merge branch 'mm/config-color-ui-default-to-auto' into maintJunio C Hamano2016-09-291-6/+12
|\ \ \ \ \ \ \
| * | | | | | | Documentation/config: default for color.* is color.uimm/config-color-ui-default-to-autoMatthieu Moy2016-09-161-6/+12
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'jk/reduce-gc-aggressive-depth' into maintJunio C Hamano2016-09-292-2/+2
|\ \ \ \ \ \ \
| * | | | | | | gc: default aggressive depth to 50jk/reduce-gc-aggressive-depthJeff King2016-08-112-2/+2
* | | | | | | | Merge branch 'jk/rebase-i-drop-ident-check' into maintJunio C Hamano2016-09-292-3/+47
|\ \ \ \ \ \ \ \
| * | | | | | | | rebase-interactive: drop early check for valid identjk/rebase-i-drop-ident-checkJeff King2016-07-292-3/+47
* | | | | | | | | Merge branch 'jt/format-patch-base-info-above-sig' into maintJunio C Hamano2016-09-292-9/+30
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | format-patch: show base info before email signaturejt/format-patch-base-info-above-sigJosh Triplett2016-09-152-9/+30
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ks/perf-build-with-autoconf' into maintJunio C Hamano2016-09-291-1/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t/perf/run: copy config.mak.autogen & friends to build areaks/perf-build-with-autoconfKirill Smelkov2016-09-151-1/+7
* | | | | | | | | | Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context' into maintJunio C Hamano2016-09-292-1/+26
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | xdiff: fix merging of hunks with -W context and -u contextrs/xdiff-merge-overlapping-hunks-for-W-contextRené Scharfe2016-09-142-1/+26
* | | | | | | | | | | Merge branch 'ew/http-do-not-forget-to-call-curl-multi-remove-handle' into maintJunio C Hamano2016-09-291-11/+18
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | http: always remove curl easy from curlm session on releaseew/http-do-not-forget-to-call-curl-multi-remove-handleEric Wong2016-09-131-4/+6
| * | | | | | | | | | | http: consolidate #ifdefs for curl_multi_remove_handleEric Wong2016-09-131-7/+10
| * | | | | | | | | | | http: warn on curl_multi_add_handle failuresEric Wong2016-09-131-0/+2
* | | | | | | | | | | | Merge branch 'jk/patch-ids-no-merges' into maintJunio C Hamano2016-09-291-0/+16
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | patch-ids: refuse to compute patch-id for merge commitjk/patch-ids-no-mergesJeff King2016-09-121-0/+15
| * | | | | | | | | | | | patch-ids: turn off rename detectionJeff King2016-09-091-0/+1
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'js/git-gui-commit-gpgsign' into maintJunio C Hamano2016-09-291-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/commit-gpgsign' of ../git-gui into js/git-gui-commit-gpgsignjs/git-gui-commit-gpgsignJunio C Hamano2016-09-111-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | git-gui: respect commit.gpgsign againJohannes Schindelin2016-09-111-0/+3
* | | | | | | | | | | | | Merge branch 'jk/fix-remote-curl-url-wo-proto' into maintJunio C Hamano2016-09-292-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | remote-curl: handle URLs without protocoljk/fix-remote-curl-url-wo-protoJeff King2016-09-082-1/+9
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'sy/git-gui-i18n-ja' into maintJunio C Hamano2016-09-291-1309/+1438
|\ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status