summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Revert part of 384364b (Start preparing for Git 2.0, 2014-03-07)nasterJunio C Hamano2014-04-011-5/+0
* Revert "Merge branch 'wk/submodule-on-branch'"Junio C Hamano2014-04-014-134/+41
* Revert "Merge branch 'wt/doc-submodule-name-path-confusion-2'"Junio C Hamano2014-04-011-1/+1
* Update draft release notes to 2.0Junio C Hamano2014-03-311-0/+13
* Merge branch 'mm/status-porcelain-format-i18n-fix'Junio C Hamano2014-03-312-5/+9
|\
| * status: disable translation when --porcelain is usedmm/status-porcelain-format-i18n-fixMatthieu Moy2014-03-262-5/+9
* | Merge branch 'an/branch-config-message'Junio C Hamano2014-03-311-23/+23
|\ \
| * | branch.c: install_branch_config: simplify if chainan/branch-config-messageAdam2014-03-241-23/+23
* | | Merge branch 'jk/tests-cleanup'Junio C Hamano2014-03-3110-180/+87
|\ \ \
| * | | t0001: drop subshells just for "cd"jk/tests-cleanupJeff King2014-03-211-47/+9
| * | | t0001: drop useless subshellsJeff King2014-03-211-39/+22
| * | | t0001: use test_must_failJeff King2014-03-211-27/+11
| * | | t0001: use test_config_globalJeff King2014-03-211-7/+4
| * | | t0001: use test_path_is_*Jeff King2014-03-211-18/+18
| * | | t0001: make symlink reinit test more carefulJeff King2014-03-211-2/+2
| * | | t: prefer "git config --file" to GIT_CONFIGJeff King2014-03-215-18/+17
| * | | t: prefer "git config --file" to GIT_CONFIG with test_must_failJeff King2014-03-211-4/+4
| * | | t: stop using GIT_CONFIG to cross repo boundariesJeff King2014-03-212-5/+5
| * | | t: drop useless sane_unset GIT_* callsJeff King2014-03-213-17/+0
| * | | t/test-lib: drop redundant unset of GIT_CONFIGJeff King2014-03-211-1/+0
| * | | t/Makefile: stop setting GIT_CONFIGJeff King2014-03-211-2/+2
* | | | Merge branch 'wt/doc-submodule-name-path-confusion-2'Junio C Hamano2014-03-311-1/+1
|\ \ \ \
| * | | | doc: submodule.*.branch config is keyed by namewt/doc-submodule-name-path-confusion-2W. Trevor King2014-03-271-1/+1
* | | | | Merge branch 'wt/doc-submodule-name-path-confusion-1'Junio C Hamano2014-03-311-1/+1
|\ \ \ \ \
| * | | | | doc: submodule.* config are keyed by submodule nameswt/doc-submodule-name-path-confusion-1W. Trevor King2014-03-271-1/+1
* | | | | | Merge branch 'mr/msvc-link-with-lcurl'Junio C Hamano2014-03-312-1/+2
|\ \ \ \ \ \
| * | | | | | MSVC: allow linking with the cURL librarymr/msvc-link-with-lcurlMarat Radchenko2014-03-272-1/+2
* | | | | | | Merge branch 'ib/rev-parse-parseopt-argh'Junio C Hamano2014-03-313-39/+100
|\ \ \ \ \ \ \
| * | | | | | | t1502: protect runs of SPs used in the indentationJunio C Hamano2014-03-231-56/+56
| * | | | | | | rev-parse --parseopt: option argument name hintsIlya Bobyr2014-03-233-3/+64
* | | | | | | | Merge branch 'dp/makefile-charset-lib-doc'Junio C Hamano2014-03-311-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Makefile: describe CHARSET_LIB betterdp/makefile-charset-lib-docДилян Палаузов2014-03-231-2/+2
* | | | | | | | | Merge branch 'js/userdiff-cc'Junio C Hamano2014-03-3133-160/+303
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | userdiff: have 'cpp' hunk header pattern catch more C++ anchor pointsjs/userdiff-ccJohannes Sixt2014-03-2113-17/+3
| * | | | | | | | | t4018: test cases showing that the cpp pattern misses many anchor pointsJohannes Sixt2014-03-2112-0/+66
| * | | | | | | | | t4018: test cases for the built-in cpp patternJohannes Sixt2014-03-219-0/+55
| * | | | | | | | | t4018: reduce test files for pattern compilation testsJohannes Sixt2014-03-211-38/+14
| * | | | | | | | | t4018: convert custom pattern test to the new infrastructureJohannes Sixt2014-03-214-24/+58
| * | | | | | | | | t4018: convert java pattern test to the new infrastructureJohannes Sixt2014-03-212-4/+8
| * | | | | | | | | t4018: convert perl pattern tests to the new infrastructureJohannes Sixt2014-03-216-88/+44
| * | | | | | | | | t4018: an infrastructure to test hunk headersJohannes Sixt2014-03-212-6/+72
| * | | | | | | | | userdiff: support unsigned and long long suffixes of integer constantsJohannes Sixt2014-03-211-1/+1
| * | | | | | | | | userdiff: support C++ ->* and .* operators in the word regexpJohannes Sixt2014-03-211-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'dw/doc-status-no-longer-shows-pound-prefix'Junio C Hamano2014-03-311-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | doc: status, remove leftover statement about '#' prefixdw/doc-status-no-longer-shows-pound-prefixDirk Wallenstein2014-03-211-1/+1
* | | | | | | | | | Merge branch 'ca/doc-config-third-party'Junio C Hamano2014-03-311-2/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | config.txt: third-party tools may and do use their own variablesca/doc-config-third-partyChris Angelico2014-03-211-2/+7
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'hs/simplify-bit-setting-in-fsck-tree'Junio C Hamano2014-03-311-12/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fsck: use bitwise-or assignment operator to set flaghs/simplify-bit-setting-in-fsck-treeHiroyuki Sano2014-03-201-12/+6
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'dt/tests-with-env-not-subshell'Junio C Hamano2014-03-3112-152/+42
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |