summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'gf/fetch-pack-direct-object-fetch' into maintJunio C Hamano2016-04-153-3/+31
|\
| * fetch-pack: update the documentation for "<refs>..." argumentsGabriel Souza Franco2016-03-051-0/+4
| * fetch-pack: fix object_id of exact sha1Gabriel Souza Franco2016-03-012-3/+27
* | Merge branch 'jk/rev-parse-local-env-vars' into maintJunio C Hamano2016-04-152-18/+77
|\ \
| * | rev-parse: let some options run outside repositoryJeff King2016-02-292-20/+34
| * | t1515: add tests for rev-parse out-of-repo helpersJeff King2016-02-281-0/+45
* | | Merge branch 'jk/config-get-urlmatch' into maintJunio C Hamano2016-04-153-11/+16
|\ \ \
| * | | Documentation/git-config: fix --get-all descriptionJohn Keeping2016-02-281-2/+1
| * | | Documentation/git-config: use bulleted list for exit codesJohn Keeping2016-02-281-7/+7
| * | | config: fail if --get-urlmatch finds no valueJohn Keeping2016-02-283-2/+8
| |/ /
* | | Merge branch 'pb/t7502-drop-dup' into maintJunio C Hamano2016-04-151-5/+0
|\ \ \
| * | | t/t7502 : drop duplicate testPranit Bauva2016-03-111-5/+0
* | | | Merge branch 'jk/test-httpd-config-nosystem' into maintJunio C Hamano2016-04-151-0/+1
|\ \ \ \
| * | | | t/lib-httpd: pass through GIT_CONFIG_NOSYSTEM envJeff King2016-03-181-0/+1
* | | | | Merge branch 'sb/clone-t57-t56' into maintJunio C Hamano2016-04-1510-0/+0
|\ \ \ \ \
| * | | | | clone tests: rename t57* => t56*Stefan Beller2016-03-1610-0/+0
* | | | | | Merge branch 'jk/credential-cache-comment-exit' into maintJunio C Hamano2016-04-151-1/+10
|\ \ \ \ \ \
| * | | | | | credential-cache--daemon: clarify "exit" action semanticsJeff King2016-03-181-1/+10
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'jc/index-pack' into maintJunio C Hamano2016-04-152-18/+23
|\ \ \ \ \ \
| * | | | | | index-pack: add a helper function to derive .idx/.keep filenameJunio C Hamano2016-03-031-18/+17
| * | | | | | Merge branch 'jc/maint-index-pack-keep' into jc/index-packJunio C Hamano2016-03-032-1/+7
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | index-pack: correct --keep[=<msg>]Junio C Hamano2016-03-032-1/+7
* | | | | | | Merge branch 'ss/exc-flag-is-a-collection-of-bits' into maintJunio C Hamano2016-04-153-9/+9
|\ \ \ \ \ \ \
| * | | | | | | dir: store EXC_FLAG_* values in unsigned integersSaurav Sachidanand2016-03-013-9/+9
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'mp/upload-pack-use-embedded-args' into maintJunio C Hamano2016-04-151-14/+11
|\ \ \ \ \ \ \
| * | | | | | | upload-pack: use argv_array for pack_objectsMichael Procter2016-02-251-14/+11
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'oa/doc-diff-check' into maintJunio C Hamano2016-04-151-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Documentation: git diff --check detects conflict markersOri Avtalion2016-03-291-2/+2
* | | | | | | | Merge branch 'pb/opt-cmdmode-doc' into maintJunio C Hamano2016-04-151-0/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | api-parse-options.txt: document OPT_CMDMODE()Pranit Bauva2016-03-251-0/+7
| |/ / / / / / /
* | | | | | | | Merge branch 'nd/apply-doc' into maintJunio C Hamano2016-04-151-1/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | git-apply.txt: mention the behavior inside a subdirNguyễn Thái Ngọc Duy2016-03-241-0/+2
| * | | | | | | | git-apply.txt: remove a spaceNguyễn Thái Ngọc Duy2016-03-241-1/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'cc/doc-recommend-performance-trace-to-file' into maintJunio C Hamano2016-04-151-0/+43
|\ \ \ \ \ \ \ \
| * | | | | | | | Documentation: talk about pager in api-trace.txtChristian Couder2016-03-071-0/+43
* | | | | | | | | Merge branch 'mm/lockfile-error-message' into maintJunio C Hamano2016-04-151-5/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | lockfile: improve error message when lockfile existsMatthieu Moy2016-03-011-3/+5
| * | | | | | | | | lockfile: mark strings for translationMatthieu Moy2016-03-011-3/+3
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Start preparing for 2.8.2Junio C Hamano2016-04-141-0/+17
* | | | | | | | | Git 2.8.1v2.8.1Junio C Hamano2016-04-034-3/+13
* | | | | | | | | Merge branch 'mm/readme-markdown' into maintJunio C Hamano2016-04-031-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git.spec.in: use README.md, not READMEMatthieu Moy2016-04-031-1/+1
* | | | | | | | | | Git 2.8v2.8.0Junio C Hamano2016-03-283-9/+14
* | | | | | | | | | Merge branch 'ls/p4-doc-markup'Junio C Hamano2016-03-241-6/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Documentation: fix git-p4 AsciiDoc formattingLars Schneider2016-03-231-5/+3
| * | | | | | | | | | Documentation: use ASCII quotation marks in git-p4Lars Schneider2016-03-211-1/+1
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'js/mingw-tests-2.8'Junio C Hamano2016-03-244-11/+19
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | mingw: skip some tests in t9115 due to file name issuesJohannes Schindelin2016-03-231-2/+2
| * | | | | | | | | | t1300: fix the new --show-origin tests on WindowsJohannes Schindelin2016-03-231-3/+6
| * | | | | | | | | | t1300-repo-config: make it resilient to being run via 'sh -x'Johannes Schindelin2016-03-231-6/+2