summaryrefslogtreecommitdiff
path: root/contrib/subtree
AgeCommit message (Expand)AuthorFilesLines
2018-10-30Merge branch 'ch/subtree-build'Libravatar Junio C Hamano1-0/+4
2018-10-18Revert "subtree: make install targets depend on build targets"Libravatar Junio C Hamano1-3/+3
2018-10-16subtree: make install targets depend on build targetsLibravatar Christian Hesse1-3/+3
2018-10-12subtree: performance improvement for finding unexpected parent commitsLibravatar Roger Strain1-1/+1
2018-10-10subtree: add build targets 'man' and 'html'Libravatar Christian Hesse1-0/+4
2018-10-07subtree: improve decision on merges kept in splitLibravatar Strain, Roger L1-2/+19
2018-10-07subtree: use commits before rejoins for splitsLibravatar Strain, Roger L1-6/+20
2018-10-07subtree: make --ignore-joins pay attention to addsLibravatar Strain, Roger L1-7/+7
2018-10-07subtree: refactor split of a commit into standalone methodLibravatar Strain, Roger L1-36/+42
2018-07-30subtree test: simplify preparation of expected resultsLibravatar Jonathan Nieder1-89/+30
2018-07-30subtree test: add missing && to &&-chainLibravatar Jonathan Nieder1-1/+1
2018-03-08Merge branch 'sg/subtree-signed-commits'Libravatar Junio C Hamano1-6/+6
2018-02-23subtree: fix add and pull for GPG-signed commitsLibravatar Stephen R Guglielmo1-6/+6
2018-02-14Correct mispellings of ".gitmodule" to ".gitmodules"Libravatar Robert P. J. Day1-1/+1
2017-08-23treewide: correct several "up-to-date" to "up to date"Libravatar Martin Ågren1-1/+1
2017-06-27subtree: honour USE_ASCIIDOCTOR when setLibravatar A. Wilcox1-7/+19
2016-08-11Spelling fixesLibravatar Ville Skyttä1-1/+1
2016-07-27subtree: adjust function definitions to match CodingGuidelinesLibravatar David Aguilar1-68/+34
2016-07-27subtree: adjust style to match CodingGuidelinesLibravatar David Aguilar1-218/+357
2016-07-26subtree: fix "git subtree split --rejoin"Libravatar David Aguilar2-0/+17
2016-07-26t7900-subtree.sh: fix quoting and broken && chainsLibravatar David Aguilar1-8/+8
2016-02-03Merge branch 'dw/subtree-split-do-not-drop-merge'Libravatar Junio C Hamano2-2/+70
2016-02-03Merge branch 'dg/subtree-test'Libravatar Junio C Hamano1-1/+5
2016-01-22Merge branch 'rm/subtree-unwrap-tags'Libravatar Junio C Hamano1-2/+8
2016-01-20contrib/subtree: fix "subtree split" skipped-merge bugLibravatar Dave Ware2-2/+70
2016-01-19contrib/subtree: Make testing easierLibravatar David A. Greene1-1/+5
2015-12-01Merge branch 'dg/subtree-test-cleanup'Libravatar Jeff King3-443/+956
2015-11-24contrib/subtree: unwrap tag refsLibravatar Rob Mayoff1-2/+8
2015-11-13contrib/subtree: Handle '--prefix' argument with a slash appendedLibravatar Techlive Zheng2-1/+21
2015-11-13contrib/subtree: Make each test self-containedLibravatar Techlive Zheng1-418/+840
2015-11-13contrib/subtree: Add split testsLibravatar Techlive Zheng1-2/+15
2015-11-13contrib/subtree: Add merge testsLibravatar Techlive Zheng1-1/+12
2015-11-13contrib/subtree: Add tests for subtree addLibravatar Techlive Zheng1-0/+19
2015-11-13contrib/subtree: Add test for missing subtreeLibravatar Techlive Zheng1-0/+4
2015-11-13contrib/subtree: Clean and refactor test codeLibravatar Techlive Zheng2-55/+79
2015-11-06contrib/subtree: remove "push" command from the "todo" fileLibravatar Fabio Porcedda1-2/+0
2015-09-08contrib/subtree: respect spaces in a repository pathLibravatar Alexey Shumkin2-1/+48
2015-09-08t7900-subtree: test the "space in a subdirectory name" caseLibravatar Alexey Shumkin2-73/+76
2015-08-03Merge branch 'da/subtree-date-confusion'Libravatar Junio C Hamano2-1/+5
2015-07-23contrib/subtree: ignore log.date configurationLibravatar David Aguilar2-1/+5
2015-07-10Merge branch 'cb/subtree-tests-update'Libravatar Junio C Hamano1-152/+150
2015-06-22contrib/subtree: small tidy-up to testLibravatar Charles Bailey1-3/+1
2015-06-22contrib/subtree: fix broken &&-chains and revealed test errorLibravatar Charles Bailey1-4/+4
2015-06-22contrib/subtree: use tabs consitently for indentation in testsLibravatar Charles Bailey1-147/+147
2015-05-22Merge branch 'dl/subtree-avoid-tricky-echo'Libravatar Junio C Hamano1-3/+10
2015-05-08contrib/subtree: portability fix for string printingLibravatar Danny Lin1-3/+10
2015-05-07contrib/subtree: there's no push --squashLibravatar Danny Lin2-2/+2
2015-01-06subtree: fix AsciiDoc list item continuationLibravatar Steffen Prohaska1-105/+89
2014-11-04Documentation: typofixesLibravatar Thomas Ackermann1-1/+1
2014-10-15subtree: add an install-html targetLibravatar Sebastian Schuberth2-3/+9