aboutsummaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAge
* mergetool: fix running in subdir when rerere enabledRichard Hansen2017-01-10
* t7610: add test case for rerere+mergetool+subdir bugRichard Hansen2017-01-10
* t7610: spell 'git reset --hard' consistentlyRichard Hansen2017-01-10
* t7610: don't assume the checked-out commitRichard Hansen2017-01-10
* t7610: always work on a test-specific branchRichard Hansen2017-01-10
* t7610: delete some now-unnecessary 'git reset --hard' linesRichard Hansen2017-01-10
* t7610: run 'git reset --hard' after each test to clean upRichard Hansen2017-01-10
* t7610: don't rely on state from previous testRichard Hansen2017-01-10
* t7610: use test_when_finished for cleanup tasksRichard Hansen2017-01-10
* t7610: move setup code to the 'setup' test caseRichard Hansen2017-01-10
* t7610: update branch names to match test numberRichard Hansen2017-01-10
* Merge branch 'ls/p4-lfs'Junio C Hamano2016-12-27
|\
| * git-p4: add diff/merge properties to .gitattributes for GitLFS filesLars Schneider2016-12-20
* | Merge branch 'lt/shortlog-by-committer'Junio C Hamano2016-12-27
|\ \
| * | t4201: make tests work with and without the MINGW prerequisteJunio C Hamano2016-12-20
| * | shortlog: test and document --committer optionJeff King2016-12-16
* | | Merge branch 'gv/p4-multi-path-commit-fix'Junio C Hamano2016-12-27
|\ \ \
| * | | git-p4: fix multi-path changelist empty commitsGeorge Vanburgh2016-12-19
* | | | Merge branch 'ld/p4-compare-dir-vs-symlink'Junio C Hamano2016-12-27
|\ \ \ \
| * | | | git-p4: avoid crash adding symlinked directoryLuke Diamand2016-12-18
| | |/ / | |/| |
* | | | Merge branch 'ls/filter-process'Junio C Hamano2016-12-27
|\ \ \ \
| * | | | t0021: fix flaky testLars Schneider2016-12-18
| * | | | docs: warn about possible '=' in clean/smudge filter process valuesLars Schneider2016-12-06
* | | | | Merge branch 'bw/transport-protocol-policy'Junio C Hamano2016-12-27
|\ \ \ \ \
| * | | | | http: respect protocol.*.allow=user for http-alternatesJeff King2016-12-15
| * | | | | transport: add from_user parameter to is_transport_allowedBrandon Williams2016-12-15
| * | | | | transport: add protocol policy config optionBrandon Williams2016-12-15
| * | | | | lib-proto-disable: variable name fixBrandon Williams2016-12-14
* | | | | | Merge branch 'cp/merge-continue'Junio C Hamano2016-12-27
|\ \ \ \ \ \
| * | | | | | merge: ensure '--abort' option takes no argumentsChris Packham2016-12-14
| * | | | | | merge: add '--continue' option as a synonym for 'git commit'Chris Packham2016-12-14
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'va/i18n-perl-scripts'Junio C Hamano2016-12-27
|\ \ \ \ \ \
| * | | | | | i18n: add--interactive: mark patch prompt for translationVasco Almeida2016-12-14
| * | | | | | i18n: add--interactive: mark plural stringsVasco Almeida2016-12-14
* | | | | | | Merge branch 'sb/submodule-config-cleanup'Junio C Hamano2016-12-27
|\ \ \ \ \ \ \
| * | | | | | | submodule-config: rename commit_sha1 to treeish_nameStefan Beller2016-11-22
* | | | | | | | Merge branch 'jc/push-default-explicit'Junio C Hamano2016-12-27
|\ \ \ \ \ \ \ \
| * | | | | | | | push: test pushing ambiguously named branchesDennis Kaarsemaker2016-10-31
* | | | | | | | | Merge branch 'jk/index-pack-wo-repo-from-stdin'Junio C Hamano2016-12-21
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t: use nongit() function where applicableJeff King2016-12-16
| * | | | | | | | | index-pack: complain when --stdin is used outside of a repoJeff King2016-12-16
| * | | | | | | | | t5000: extract nongit function to test-lib-functions.shJeff King2016-12-16
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/quote-env-path-list-component'Junio C Hamano2016-12-21
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t5615-alternate-env: double-quotes in file names do not work on WindowsJohannes Sixt2016-12-21
| * | | | | | | | | t5547-push-quarantine: run the path separator test on Windows, tooJohannes Sixt2016-12-13
| * | | | | | | | | tmp-objdir: quote paths we add to alternatesJeff King2016-12-12
| * | | | | | | | | alternates: accept double-quoted pathsJeff King2016-12-12
| * | | | | | | | | Merge branch 'jk/alt-odb-cleanup' into jk/quote-env-path-list-componentJunio C Hamano2016-12-12
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge branch 'vs/submodule-clone-nested-submodules-alternates'Junio C Hamano2016-12-21
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | submodule--helper: set alternateLocation for cloned submodulesVitaly "_Vi" Shukela2016-12-12
| | |_|/ / / / / / / / | |/| | | | | | | | |