Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge branch 'wt/doc-submodule-name-path-confusion-1' | Junio C Hamano | 2014-03-31 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | doc: submodule.* config are keyed by submodule nameswt/doc-submodule-name-path-confusion-1 | W. Trevor King | 2014-03-27 | 1 | -1/+1 | |
* | | | | | | Merge branch 'mr/msvc-link-with-lcurl' | Junio C Hamano | 2014-03-31 | 2 | -1/+2 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | MSVC: allow linking with the cURL librarymr/msvc-link-with-lcurl | Marat Radchenko | 2014-03-27 | 2 | -1/+2 | |
* | | | | | | | Merge branch 'ib/rev-parse-parseopt-argh' | Junio C Hamano | 2014-03-31 | 3 | -39/+100 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | t1502: protect runs of SPs used in the indentation | Junio C Hamano | 2014-03-23 | 1 | -56/+56 | |
| * | | | | | | | rev-parse --parseopt: option argument name hints | Ilya Bobyr | 2014-03-23 | 3 | -3/+64 | |
* | | | | | | | | Merge branch 'dp/makefile-charset-lib-doc' | Junio C Hamano | 2014-03-31 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Makefile: describe CHARSET_LIB betterdp/makefile-charset-lib-doc | Дилян Палаузов | 2014-03-23 | 1 | -2/+2 | |
* | | | | | | | | | Merge branch 'js/userdiff-cc' | Junio C Hamano | 2014-03-31 | 33 | -160/+303 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | userdiff: have 'cpp' hunk header pattern catch more C++ anchor pointsjs/userdiff-cc | Johannes Sixt | 2014-03-21 | 13 | -17/+3 | |
| * | | | | | | | | | t4018: test cases showing that the cpp pattern misses many anchor points | Johannes Sixt | 2014-03-21 | 12 | -0/+66 | |
| * | | | | | | | | | t4018: test cases for the built-in cpp pattern | Johannes Sixt | 2014-03-21 | 9 | -0/+55 | |
| * | | | | | | | | | t4018: reduce test files for pattern compilation tests | Johannes Sixt | 2014-03-21 | 1 | -38/+14 | |
| * | | | | | | | | | t4018: convert custom pattern test to the new infrastructure | Johannes Sixt | 2014-03-21 | 4 | -24/+58 | |
| * | | | | | | | | | t4018: convert java pattern test to the new infrastructure | Johannes Sixt | 2014-03-21 | 2 | -4/+8 | |
| * | | | | | | | | | t4018: convert perl pattern tests to the new infrastructure | Johannes Sixt | 2014-03-21 | 6 | -88/+44 | |
| * | | | | | | | | | t4018: an infrastructure to test hunk headers | Johannes Sixt | 2014-03-21 | 2 | -6/+72 | |
| * | | | | | | | | | userdiff: support unsigned and long long suffixes of integer constants | Johannes Sixt | 2014-03-21 | 1 | -1/+1 | |
| * | | | | | | | | | userdiff: support C++ ->* and .* operators in the word regexp | Johannes Sixt | 2014-03-21 | 1 | -1/+1 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge branch 'dw/doc-status-no-longer-shows-pound-prefix' | Junio C Hamano | 2014-03-31 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | doc: status, remove leftover statement about '#' prefixdw/doc-status-no-longer-shows-pound-prefix | Dirk Wallenstein | 2014-03-21 | 1 | -1/+1 | |
* | | | | | | | | | | Merge branch 'ca/doc-config-third-party' | Junio C Hamano | 2014-03-31 | 1 | -2/+7 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | config.txt: third-party tools may and do use their own variablesca/doc-config-third-party | Chris Angelico | 2014-03-21 | 1 | -2/+7 | |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'hs/simplify-bit-setting-in-fsck-tree' | Junio C Hamano | 2014-03-31 | 1 | -12/+6 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | fsck: use bitwise-or assignment operator to set flaghs/simplify-bit-setting-in-fsck-tree | Hiroyuki Sano | 2014-03-20 | 1 | -12/+6 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Merge branch 'dt/tests-with-env-not-subshell' | Junio C Hamano | 2014-03-31 | 12 | -152/+42 | |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | ||||||
| * | | | | | | | | | tests: use "env" to run commands with temporary env-var settingsdt/tests-with-env-not-subshell | David Tran | 2014-03-19 | 12 | -152/+42 | |
| | |_|/ / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Update draft release notes to 2.0 | Junio C Hamano | 2014-03-28 | 1 | -0/+27 | |
* | | | | | | | | | Merge branch 'ys/fsck-commit-parsing' | Junio C Hamano | 2014-03-28 | 1 | -12/+14 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | fsck.c:fsck_commit(): use skip_prefix() to verify and skip constantys/fsck-commit-parsing | Yuxuan Shui | 2014-03-19 | 1 | -11/+13 | |
| * | | | | | | | | | fsck.c:fsck_ident(): ident points at a const string | Yuxuan Shui | 2014-03-13 | 1 | -2/+2 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge branch 'bg/rebase-off-of-previous-branch' | Junio C Hamano | 2014-03-28 | 2 | -0/+21 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | rebase: allow "-" short-hand for the previous branch | Brian Gesiak | 2014-03-19 | 2 | -0/+21 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge branch 'bp/commit-p-editor' | Junio C Hamano | 2014-03-28 | 10 | -39/+137 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | run-command: mark run_hook_with_custom_index as deprecatedbp/commit-p-editor | Benoit Pierre | 2014-03-18 | 1 | -0/+1 | |
| * | | | | | | | | | merge hook tests: fix and update tests | Benoit Pierre | 2014-03-18 | 1 | -6/+21 | |
| * | | | | | | | | | merge: fix GIT_EDITOR override for commit hook | Benoit Pierre | 2014-03-18 | 1 | -1/+1 | |
| * | | | | | | | | | commit: fix patch hunk editing with "commit -p -m" | Benoit Pierre | 2014-03-18 | 9 | -32/+80 | |
| * | | | | | | | | | test patch hunk editing with "commit -p -m" | Benoit Pierre | 2014-03-18 | 1 | -0/+34 | |
| * | | | | | | | | | merge hook tests: use 'test_must_fail' instead of '!' | Benoit Pierre | 2014-03-11 | 1 | -2/+2 | |
| * | | | | | | | | | merge hook tests: fix missing '&&' in test | Benoit Pierre | 2014-03-11 | 1 | -1/+1 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge branch 'ah/doc-gitk-config' | Junio C Hamano | 2014-03-28 | 1 | -2/+8 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Documentation/gitk: document the location of the configulation fileah/doc-gitk-config | Astril Hayato | 2014-03-20 | 1 | -2/+8 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge branch 'fr/add-interactive-argv-array' | Junio C Hamano | 2014-03-28 | 1 | -11/+10 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | add: use struct argv_array in run_add_interactive()fr/add-interactive-argv-array | Fabian Ruch | 2014-03-18 | 1 | -11/+10 | |
* | | | | | | | | | | Merge branch 'jk/subtree-prefix' | Junio C Hamano | 2014-03-28 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | subtree: initialize "prefix" variablejk/subtree-prefix | Jeff King | 2014-03-17 | 1 | -0/+1 | |
* | | | | | | | | | | | Merge branch 'jk/pack-bitmap-progress' | Junio C Hamano | 2014-03-28 | 1 | -11/+19 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | pack-objects: show reused packfile objects in "Counting objects"jk/pack-bitmap-progress | Jeff King | 2014-03-17 | 1 | -8/+3 |