summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2014-03-31Merge branch 'js/userdiff-cc'Libravatar Junio C Hamano33-160/+303
2014-03-31Merge branch 'dw/doc-status-no-longer-shows-pound-prefix'Libravatar Junio C Hamano1-1/+1
2014-03-31Merge branch 'ca/doc-config-third-party'Libravatar Junio C Hamano1-2/+7
2014-03-31Merge branch 'hs/simplify-bit-setting-in-fsck-tree'Libravatar Junio C Hamano1-12/+6
2014-03-31Merge branch 'dt/tests-with-env-not-subshell'Libravatar Junio C Hamano12-152/+42
2014-03-28Update draft release notes to 2.0Libravatar Junio C Hamano1-0/+27
2014-03-28Merge branch 'ys/fsck-commit-parsing'Libravatar Junio C Hamano1-12/+14
2014-03-28Merge branch 'bg/rebase-off-of-previous-branch'Libravatar Junio C Hamano2-0/+21
2014-03-28Merge branch 'bp/commit-p-editor'Libravatar Junio C Hamano10-39/+137
2014-03-28Merge branch 'ah/doc-gitk-config'Libravatar Junio C Hamano1-2/+8
2014-03-28Merge branch 'fr/add-interactive-argv-array'Libravatar Junio C Hamano1-11/+10
2014-03-28Merge branch 'jk/subtree-prefix'Libravatar Junio C Hamano1-0/+1
2014-03-28Merge branch 'jk/pack-bitmap-progress'Libravatar Junio C Hamano1-11/+19
2014-03-28Merge branch 'jk/pack-bitmap'Libravatar Junio C Hamano2-2/+15
2014-03-25Update draft release notes to 2.0Libravatar Junio C Hamano1-0/+29
2014-03-25Merge branch 'ss/test-on-mingw-rsync-path-no-absolute'Libravatar Junio C Hamano1-3/+3
2014-03-25Merge branch 'bb/diff-no-index-dotdot'Libravatar Junio C Hamano1-4/+5
2014-03-25Merge branch 'us/printf-not-echo'Libravatar Junio C Hamano2-3/+3
2014-03-25Merge branch 'rr/doc-merge-strategies'Libravatar Junio C Hamano1-2/+2
2014-03-25Merge branch 'nd/index-pack-error-message'Libravatar Junio C Hamano1-2/+2
2014-03-25Merge branch 'jk/lib-terminal-lazy'Libravatar Junio C Hamano1-18/+19
2014-03-25Merge branch 'dm/configure-iconv-locale-charset'Libravatar Junio C Hamano1-1/+1
2014-03-25Merge branch 'nd/commit-editor-cleanup'Libravatar Junio C Hamano5-12/+48
2014-03-25Merge branch 'jk/warn-on-object-refname-ambiguity'Libravatar Junio C Hamano2-6/+15
2014-03-25Merge branch 'mh/remove-subtree-long-pathname-fix'Libravatar Junio C Hamano1-32/+32
2014-03-25Merge branch 'nd/indent-fix-connect-c'Libravatar Junio C Hamano1-1/+1
2014-03-25Merge branch 'jk/mv-submodules-fix'Libravatar Junio C Hamano2-1/+21
2014-03-25Merge branch 'cp/am-patch-format-doc'Libravatar Junio C Hamano1-1/+7
2014-03-21userdiff: have 'cpp' hunk header pattern catch more C++ anchor pointsLibravatar Johannes Sixt13-17/+3
2014-03-21t4018: test cases showing that the cpp pattern misses many anchor pointsLibravatar Johannes Sixt12-0/+66
2014-03-21t4018: test cases for the built-in cpp patternLibravatar Johannes Sixt9-0/+55
2014-03-21t4018: reduce test files for pattern compilation testsLibravatar Johannes Sixt1-38/+14
2014-03-21t4018: convert custom pattern test to the new infrastructureLibravatar Johannes Sixt4-24/+58
2014-03-21t4018: convert java pattern test to the new infrastructureLibravatar Johannes Sixt2-4/+8
2014-03-21t4018: convert perl pattern tests to the new infrastructureLibravatar Johannes Sixt6-88/+44
2014-03-21t4018: an infrastructure to test hunk headersLibravatar Johannes Sixt2-6/+72
2014-03-21userdiff: support unsigned and long long suffixes of integer constantsLibravatar Johannes Sixt1-1/+1
2014-03-21userdiff: support C++ ->* and .* operators in the word regexpLibravatar Johannes Sixt1-1/+1
2014-03-21Update draft release notes to 2.0Libravatar Junio C Hamano1-2/+26
2014-03-21Merge branch 'lt/request-pull'Libravatar Junio C Hamano3-83/+126
2014-03-21Merge branch 'es/sh-i18n-envsubst'Libravatar Junio C Hamano1-12/+0
2014-03-21Merge branch 'nd/upload-pack-shallow'Libravatar Junio C Hamano4-3/+65
2014-03-21Merge branch 'jn/wt-status'Libravatar Junio C Hamano3-55/+88
2014-03-21Merge branch 'jc/stash-pop-not-popped'Libravatar Junio C Hamano1-2/+8
2014-03-21Merge branch 'dk/skip-prefix-scan-only-once'Libravatar Junio C Hamano1-2/+5
2014-03-21Merge branch 'nd/tag-version-sort'Libravatar Junio C Hamano6-5/+211
2014-03-21Merge branch 'jk/shallow-update-fix'Libravatar Junio C Hamano5-56/+49
2014-03-21Merge branch 'tc/commit-dry-run-exit-status-tests'Libravatar Junio C Hamano1-0/+36
2014-03-21config.txt: third-party tools may and do use their own variablesLibravatar Chris Angelico1-2/+7
2014-03-21doc: status, remove leftover statement about '#' prefixLibravatar Dirk Wallenstein1-1/+1