aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
* | | | | | | | | Merge branch 'js/userdiff-cc'Junio C Hamano2014-03-31
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | userdiff: have 'cpp' hunk header pattern catch more C++ anchor pointsJohannes Sixt2014-03-21
| * | | | | | | | | t4018: test cases showing that the cpp pattern misses many anchor pointsJohannes Sixt2014-03-21
| * | | | | | | | | t4018: test cases for the built-in cpp patternJohannes Sixt2014-03-21
| * | | | | | | | | t4018: reduce test files for pattern compilation testsJohannes Sixt2014-03-21
| * | | | | | | | | t4018: convert custom pattern test to the new infrastructureJohannes Sixt2014-03-21
| * | | | | | | | | t4018: convert java pattern test to the new infrastructureJohannes Sixt2014-03-21
| * | | | | | | | | t4018: convert perl pattern tests to the new infrastructureJohannes Sixt2014-03-21
| * | | | | | | | | t4018: an infrastructure to test hunk headersJohannes Sixt2014-03-21
| * | | | | | | | | userdiff: support unsigned and long long suffixes of integer constantsJohannes Sixt2014-03-21
| * | | | | | | | | userdiff: support C++ ->* and .* operators in the word regexpJohannes Sixt2014-03-21
| |/ / / / / / / /
* | | | | | | | | Merge branch 'dw/doc-status-no-longer-shows-pound-prefix'Junio C Hamano2014-03-31
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | doc: status, remove leftover statement about '#' prefixDirk Wallenstein2014-03-21
* | | | | | | | | | Merge branch 'ca/doc-config-third-party'Junio C Hamano2014-03-31
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | config.txt: third-party tools may and do use their own variablesChris Angelico2014-03-21
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'hs/simplify-bit-setting-in-fsck-tree'Junio C Hamano2014-03-31
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fsck: use bitwise-or assignment operator to set flagHiroyuki Sano2014-03-20
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'dt/tests-with-env-not-subshell'Junio C Hamano2014-03-31
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | tests: use "env" to run commands with temporary env-var settingsDavid Tran2014-03-19
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Update draft release notes to 2.0Junio C Hamano2014-03-28
* | | | | | | | | Merge branch 'ys/fsck-commit-parsing'Junio C Hamano2014-03-28
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fsck.c:fsck_commit(): use skip_prefix() to verify and skip constantYuxuan Shui2014-03-19
| * | | | | | | | | fsck.c:fsck_ident(): ident points at a const stringYuxuan Shui2014-03-13
| |/ / / / / / / /
* | | | | | | | | Merge branch 'bg/rebase-off-of-previous-branch'Junio C Hamano2014-03-28
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | rebase: allow "-" short-hand for the previous branchBrian Gesiak2014-03-19
| |/ / / / / / / /
* | | | | | | | | Merge branch 'bp/commit-p-editor'Junio C Hamano2014-03-28
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | run-command: mark run_hook_with_custom_index as deprecatedBenoit Pierre2014-03-18
| * | | | | | | | | merge hook tests: fix and update testsBenoit Pierre2014-03-18
| * | | | | | | | | merge: fix GIT_EDITOR override for commit hookBenoit Pierre2014-03-18
| * | | | | | | | | commit: fix patch hunk editing with "commit -p -m"Benoit Pierre2014-03-18
| * | | | | | | | | test patch hunk editing with "commit -p -m"Benoit Pierre2014-03-18
| * | | | | | | | | merge hook tests: use 'test_must_fail' instead of '!'Benoit Pierre2014-03-11
| * | | | | | | | | merge hook tests: fix missing '&&' in testBenoit Pierre2014-03-11
| |/ / / / / / / /
* | | | | | | | | Merge branch 'ah/doc-gitk-config'Junio C Hamano2014-03-28
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Documentation/gitk: document the location of the configulation fileAstril Hayato2014-03-20
| |/ / / / / / / /
* | | | | | | | | Merge branch 'fr/add-interactive-argv-array'Junio C Hamano2014-03-28
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | add: use struct argv_array in run_add_interactive()Fabian Ruch2014-03-18
* | | | | | | | | | Merge branch 'jk/subtree-prefix'Junio C Hamano2014-03-28
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | subtree: initialize "prefix" variableJeff King2014-03-17
* | | | | | | | | | | Merge branch 'jk/pack-bitmap-progress'Junio C Hamano2014-03-28
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | pack-objects: show reused packfile objects in "Counting objects"Jeff King2014-03-17
| * | | | | | | | | | | pack-objects: show progress for reused packfilesJeff King2014-03-17
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'jk/pack-bitmap'Junio C Hamano2014-03-28
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | pack-objects: turn off bitmaps when skipping objectsJeff King2014-03-17
* | | | | | | | | | | | Update draft release notes to 2.0Junio C Hamano2014-03-25
* | | | | | | | | | | | Merge branch 'ss/test-on-mingw-rsync-path-no-absolute'Junio C Hamano2014-03-25
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t5510: Do not use $(pwd) when fetching / pushing / pulling via rsyncSebastian Schuberth2014-03-19
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'bb/diff-no-index-dotdot'Junio C Hamano2014-03-25
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | diff-no-index: replace manual "."/".." check with is_dot_or_dotdot()Brian Bourn2014-03-19
| * | | | | | | | | | | | diff-no-index: rename read_directory()Brian Bourn2014-03-19
| |/ / / / / / / / / / /