summaryrefslogtreecommitdiff
path: root/contrib/subtree
Commit message (Expand)AuthorAgeFilesLines
* contrib/subtree: ensure only one rev is providedDenton Liu2019-03-121-12/+12
* Merge branch 'ch/subtree-build'Junio C Hamano2018-10-301-0/+4
|\
| * Revert "subtree: make install targets depend on build targets"Junio C Hamano2018-10-181-3/+3
| * subtree: make install targets depend on build targetsChristian Hesse2018-10-161-3/+3
| * subtree: add build targets 'man' and 'html'Christian Hesse2018-10-101-0/+4
* | subtree: performance improvement for finding unexpected parent commitsRoger Strain2018-10-121-1/+1
* | subtree: improve decision on merges kept in splitStrain, Roger L2018-10-071-2/+19
* | subtree: use commits before rejoins for splitsStrain, Roger L2018-10-071-6/+20
* | subtree: make --ignore-joins pay attention to addsStrain, Roger L2018-10-071-7/+7
* | subtree: refactor split of a commit into standalone methodStrain, Roger L2018-10-071-36/+42
|/
* subtree test: simplify preparation of expected resultsJonathan Nieder2018-07-301-89/+30
* subtree test: add missing && to &&-chainJonathan Nieder2018-07-301-1/+1
* Merge branch 'sg/subtree-signed-commits'Junio C Hamano2018-03-081-6/+6
|\
| * subtree: fix add and pull for GPG-signed commitssg/subtree-signed-commitsStephen R Guglielmo2018-02-231-6/+6
* | Correct mispellings of ".gitmodule" to ".gitmodules"rd/typofixRobert P. J. Day2018-02-141-1/+1
|/
* treewide: correct several "up-to-date" to "up to date"ma/up-to-dateMartin Ågren2017-08-231-1/+1
* subtree: honour USE_ASCIIDOCTOR when setaw/contrib-subtree-doc-asciidoctorA. Wilcox2017-06-271-7/+19
* Spelling fixesvs/typofixVille Skyttä2016-08-111-1/+1
* subtree: adjust function definitions to match CodingGuidelinesda/subtree-modernizeDavid Aguilar2016-07-271-68/+34
* subtree: adjust style to match CodingGuidelinesDavid Aguilar2016-07-271-218/+357
* subtree: fix "git subtree split --rejoin"da/subtree-2.9-regressionDavid Aguilar2016-07-262-0/+17
* t7900-subtree.sh: fix quoting and broken && chainsDavid Aguilar2016-07-261-8/+8
* Merge branch 'dw/subtree-split-do-not-drop-merge'Junio C Hamano2016-02-032-2/+70
|\
| * contrib/subtree: fix "subtree split" skipped-merge bugdw/subtree-split-do-not-drop-mergeDave Ware2016-01-202-2/+70
* | Merge branch 'dg/subtree-test'Junio C Hamano2016-02-031-1/+5
|\ \
| * | contrib/subtree: Make testing easierdg/subtree-testDavid A. Greene2016-01-191-1/+5
| |/
* | Merge branch 'rm/subtree-unwrap-tags'Junio C Hamano2016-01-221-2/+8
|\ \ | |/ |/|
| * contrib/subtree: unwrap tag refsrm/subtree-unwrap-tagsRob Mayoff2015-11-241-2/+8
* | Merge branch 'dg/subtree-test-cleanup'Jeff King2015-12-013-443/+956
|\ \
| * | contrib/subtree: Handle '--prefix' argument with a slash appendedTechlive Zheng2015-11-132-1/+21
| * | contrib/subtree: Make each test self-containedTechlive Zheng2015-11-131-418/+840
| * | contrib/subtree: Add split testsTechlive Zheng2015-11-131-2/+15
| * | contrib/subtree: Add merge testsTechlive Zheng2015-11-131-1/+12
| * | contrib/subtree: Add tests for subtree addTechlive Zheng2015-11-131-0/+19
| * | contrib/subtree: Add test for missing subtreeTechlive Zheng2015-11-131-0/+4
| * | contrib/subtree: Clean and refactor test codeTechlive Zheng2015-11-132-55/+79
* | | contrib/subtree: remove "push" command from the "todo" filefp/subtree-todo-updateFabio Porcedda2015-11-061-2/+0
|/ /
* | contrib/subtree: respect spaces in a repository pathas/subtree-with-spacesAlexey Shumkin2015-09-082-1/+48
* | t7900-subtree: test the "space in a subdirectory name" caseAlexey Shumkin2015-09-082-73/+76
|/
* Merge branch 'da/subtree-date-confusion'Junio C Hamano2015-08-032-1/+5
|\
| * contrib/subtree: ignore log.date configurationda/subtree-date-confusionDavid Aguilar2015-07-232-1/+5
* | Merge branch 'cb/subtree-tests-update'Junio C Hamano2015-07-101-152/+150
|\ \
| * | contrib/subtree: small tidy-up to testcb/subtree-tests-updateCharles Bailey2015-06-221-3/+1
| * | contrib/subtree: fix broken &&-chains and revealed test errorCharles Bailey2015-06-221-4/+4
| * | contrib/subtree: use tabs consitently for indentation in testsCharles Bailey2015-06-221-147/+147
| |/
* | Merge branch 'dl/subtree-avoid-tricky-echo'Junio C Hamano2015-05-221-3/+10
|\ \
| * | contrib/subtree: portability fix for string printingdl/subtree-avoid-tricky-echoDanny Lin2015-05-081-3/+10
| |/
* | contrib/subtree: there's no push --squashdl/subtree-push-no-squashDanny Lin2015-05-072-2/+2
|/
* subtree: fix AsciiDoc list item continuationsp/subtree-docSteffen Prohaska2015-01-061-105/+89
* Documentation: typofixesThomas Ackermann2014-11-041-1/+1
View Lorry Controller Status