summaryrefslogtreecommitdiff
path: root/contrib/subtree
Commit message (Expand)AuthorAgeFilesLines
* 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
* subtree: add an install-html targetSebastian Schuberth2014-10-152-3/+9
* subtree: make "all" default target of Makefilejk/contrib-subtree-make-allJeff King2014-08-181-1/+4
* Fix contrib/subtree Makefile to patch #! lineCharles Bailey2014-07-211-1/+7
* Merge branch 'ep/shell-assign-and-export-vars'Junio C Hamano2014-06-061-1/+2
|\
| * scripts: "export VAR=VALUE" construct is not portableElia Pinto2014-05-231-1/+2
* | Merge branch 'jd/subtree'Junio C Hamano2014-06-062-16/+25
|\ \
| * | contrib/subtree: allow adding an annotated tagjd/subtreeJames Denholm2014-05-131-1/+2
| * | contrib/subtree/Makefile: clean up rule for "clean"James Denholm2014-05-061-3/+4
| * | contrib/subtree/Makefile: clean up rules to generate documentationJames Denholm2014-05-061-5/+8
| * | contrib/subtree/Makefile: s/libexecdir/gitexecdir/James Denholm2014-05-061-3/+3
| * | contrib/subtree/Makefile: use GIT-VERSION-FILEJames Denholm2014-05-061-3/+8
| * | contrib/subtree/Makefile: scrap unused $(gitdir)James Denholm2014-05-061-1/+0
* | | Merge branch 'ep/shell-command-substitution'Junio C Hamano2014-06-031-1/+1
|\ \ \ | |/ / |/| |
| * | t7900-subtree.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-231-1/+1
* | | subtree: initialize "prefix" variablejk/subtree-prefixJeff King2014-03-171-0/+1
|/ /
* | subtree: fix argument validation in add/pull/pushab/subtree-docAnthony Baire2014-01-132-13/+23
|/
* Merge branch 'jk/subtree-install-fix'Junio C Hamano2013-11-041-1/+6
|\
| * subtree: add makefile target for html docsjk/subtree-install-fixJeff King2013-10-301-1/+6
* | Merge branch 'ob/typofixes'Junio C Hamano2013-08-011-1/+1
|\ \ | |/ |/|
| * many small typofixesob/typofixesOndřej Bílka2013-07-291-1/+1
View Lorry Controller Status