Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
* | | | | | | | | | Merge branch 'js/userdiff-cc' | Junio C Hamano | 2014-03-31 | |
|\ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | userdiff: have 'cpp' hunk header pattern catch more C++ anchor points | Johannes Sixt | 2014-03-21 | |
| * | | | | | | | | | t4018: test cases showing that the cpp pattern misses many anchor points | Johannes Sixt | 2014-03-21 | |
| * | | | | | | | | | t4018: test cases for the built-in cpp pattern | Johannes Sixt | 2014-03-21 | |
| * | | | | | | | | | t4018: reduce test files for pattern compilation tests | Johannes Sixt | 2014-03-21 | |
| * | | | | | | | | | t4018: convert custom pattern test to the new infrastructure | Johannes Sixt | 2014-03-21 | |
| * | | | | | | | | | t4018: convert java pattern test to the new infrastructure | Johannes Sixt | 2014-03-21 | |
| * | | | | | | | | | t4018: convert perl pattern tests to the new infrastructure | Johannes Sixt | 2014-03-21 | |
| * | | | | | | | | | t4018: an infrastructure to test hunk headers | Johannes Sixt | 2014-03-21 | |
| * | | | | | | | | | userdiff: support unsigned and long long suffixes of integer constants | Johannes Sixt | 2014-03-21 | |
| * | | | | | | | | | userdiff: support C++ ->* and .* operators in the word regexp | Johannes Sixt | 2014-03-21 | |
| |/ / / / / / / / | ||||
* | | | | | | | | | Merge branch 'dw/doc-status-no-longer-shows-pound-prefix' | Junio C Hamano | 2014-03-31 | |
|\ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | doc: status, remove leftover statement about '#' prefix | Dirk Wallenstein | 2014-03-21 | |
* | | | | | | | | | | Merge branch 'ca/doc-config-third-party' | Junio C Hamano | 2014-03-31 | |
|\ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | config.txt: third-party tools may and do use their own variables | Chris Angelico | 2014-03-21 | |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | ||||
* | | | | | | | | | | Merge branch 'hs/simplify-bit-setting-in-fsck-tree' | Junio C Hamano | 2014-03-31 | |
|\ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | fsck: use bitwise-or assignment operator to set flag | Hiroyuki Sano | 2014-03-20 | |
| |/ / / / / / / / / | ||||
* | | | | | | | | | | Merge branch 'dt/tests-with-env-not-subshell' | Junio C Hamano | 2014-03-31 | |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | ||||
| * | | | | | | | | | tests: use "env" to run commands with temporary env-var settings | David Tran | 2014-03-19 | |
| | |_|/ / / / / / | |/| | | | | | | | ||||
* | | | | | | | | | Update draft release notes to 2.0 | Junio C Hamano | 2014-03-28 | |
* | | | | | | | | | Merge branch 'ys/fsck-commit-parsing' | Junio C Hamano | 2014-03-28 | |
|\ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | fsck.c:fsck_commit(): use skip_prefix() to verify and skip constant | Yuxuan Shui | 2014-03-19 | |
| * | | | | | | | | | fsck.c:fsck_ident(): ident points at a const string | Yuxuan Shui | 2014-03-13 | |
| |/ / / / / / / / | ||||
* | | | | | | | | | Merge branch 'bg/rebase-off-of-previous-branch' | Junio C Hamano | 2014-03-28 | |
|\ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | rebase: allow "-" short-hand for the previous branch | Brian Gesiak | 2014-03-19 | |
| |/ / / / / / / / | ||||
* | | | | | | | | | Merge branch 'bp/commit-p-editor' | Junio C Hamano | 2014-03-28 | |
|\ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | run-command: mark run_hook_with_custom_index as deprecated | Benoit Pierre | 2014-03-18 | |
| * | | | | | | | | | merge hook tests: fix and update tests | Benoit Pierre | 2014-03-18 | |
| * | | | | | | | | | merge: fix GIT_EDITOR override for commit hook | Benoit Pierre | 2014-03-18 | |
| * | | | | | | | | | commit: fix patch hunk editing with "commit -p -m" | Benoit Pierre | 2014-03-18 | |
| * | | | | | | | | | test patch hunk editing with "commit -p -m" | Benoit Pierre | 2014-03-18 | |
| * | | | | | | | | | merge hook tests: use 'test_must_fail' instead of '!' | Benoit Pierre | 2014-03-11 | |
| * | | | | | | | | | merge hook tests: fix missing '&&' in test | Benoit Pierre | 2014-03-11 | |
| |/ / / / / / / / | ||||
* | | | | | | | | | Merge branch 'ah/doc-gitk-config' | Junio C Hamano | 2014-03-28 | |
|\ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | Documentation/gitk: document the location of the configulation file | Astril Hayato | 2014-03-20 | |
| |/ / / / / / / / | ||||
* | | | | | | | | | Merge branch 'fr/add-interactive-argv-array' | Junio C Hamano | 2014-03-28 | |
|\ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | add: use struct argv_array in run_add_interactive() | Fabian Ruch | 2014-03-18 | |
* | | | | | | | | | | Merge branch 'jk/subtree-prefix' | Junio C Hamano | 2014-03-28 | |
|\ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | subtree: initialize "prefix" variable | Jeff King | 2014-03-17 | |
* | | | | | | | | | | | Merge branch 'jk/pack-bitmap-progress' | Junio C Hamano | 2014-03-28 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | pack-objects: show reused packfile objects in "Counting objects" | Jeff King | 2014-03-17 | |
| * | | | | | | | | | | | pack-objects: show progress for reused packfiles | Jeff King | 2014-03-17 | |
| |/ / / / / / / / / / | ||||
* | | | | | | | | | | | Merge branch 'jk/pack-bitmap' | Junio C Hamano | 2014-03-28 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | pack-objects: turn off bitmaps when skipping objects | Jeff King | 2014-03-17 | |
* | | | | | | | | | | | | Update draft release notes to 2.0 | Junio C Hamano | 2014-03-25 | |
* | | | | | | | | | | | | Merge branch 'ss/test-on-mingw-rsync-path-no-absolute' | Junio C Hamano | 2014-03-25 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | t5510: Do not use $(pwd) when fetching / pushing / pulling via rsync | Sebastian Schuberth | 2014-03-19 | |
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | ||||
* | | | | | | | | | | | | Merge branch 'bb/diff-no-index-dotdot' | Junio C Hamano | 2014-03-25 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | diff-no-index: replace manual "."/".." check with is_dot_or_dotdot() | Brian Bourn | 2014-03-19 | |
| * | | | | | | | | | | | | diff-no-index: rename read_directory() | Brian Bourn | 2014-03-19 | |
| |/ / / / / / / / / / / |