summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | 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
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | tests: use "env" to run commands with temporary env-var settingsdt/tests-with-env-not-subshellDavid Tran2014-03-1912-152/+42
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Update draft release notes to 2.0Junio C Hamano2014-03-281-0/+27
* | | | | | | | | Merge branch 'ys/fsck-commit-parsing'Junio C Hamano2014-03-281-12/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fsck.c:fsck_commit(): use skip_prefix() to verify and skip constantys/fsck-commit-parsingYuxuan Shui2014-03-191-11/+13
| * | | | | | | | | fsck.c:fsck_ident(): ident points at a const stringYuxuan Shui2014-03-131-2/+2
| |/ / / / / / / /
* | | | | | | | | Merge branch 'bg/rebase-off-of-previous-branch'Junio C Hamano2014-03-282-0/+21
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | rebase: allow "-" short-hand for the previous branchBrian Gesiak2014-03-192-0/+21
| |/ / / / / / / /
* | | | | | | | | Merge branch 'bp/commit-p-editor'Junio C Hamano2014-03-2810-39/+137
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | run-command: mark run_hook_with_custom_index as deprecatedbp/commit-p-editorBenoit Pierre2014-03-181-0/+1
| * | | | | | | | | merge hook tests: fix and update testsBenoit Pierre2014-03-181-6/+21
| * | | | | | | | | merge: fix GIT_EDITOR override for commit hookBenoit Pierre2014-03-181-1/+1
| * | | | | | | | | commit: fix patch hunk editing with "commit -p -m"Benoit Pierre2014-03-189-32/+80
| * | | | | | | | | test patch hunk editing with "commit -p -m"Benoit Pierre2014-03-181-0/+34
| * | | | | | | | | merge hook tests: use 'test_must_fail' instead of '!'Benoit Pierre2014-03-111-2/+2
| * | | | | | | | | merge hook tests: fix missing '&&' in testBenoit Pierre2014-03-111-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'ah/doc-gitk-config'Junio C Hamano2014-03-281-2/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Documentation/gitk: document the location of the configulation fileah/doc-gitk-configAstril Hayato2014-03-201-2/+8
| |/ / / / / / / /
* | | | | | | | | Merge branch 'fr/add-interactive-argv-array'Junio C Hamano2014-03-281-11/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | add: use struct argv_array in run_add_interactive()fr/add-interactive-argv-arrayFabian Ruch2014-03-181-11/+10
* | | | | | | | | | Merge branch 'jk/subtree-prefix'Junio C Hamano2014-03-281-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | subtree: initialize "prefix" variablejk/subtree-prefixJeff King2014-03-171-0/+1
* | | | | | | | | | | Merge branch 'jk/pack-bitmap-progress'Junio C Hamano2014-03-281-11/+19
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | pack-objects: show reused packfile objects in "Counting objects"jk/pack-bitmap-progressJeff King2014-03-171-8/+3