| Commit message (Expand) | Author | Age | Files | Lines |
* | subtree test: simplify preparation of expected results | Jonathan Nieder | 2018-07-30 | 1 | -89/+30 |
* | subtree test: add missing && to &&-chain | Jonathan Nieder | 2018-07-30 | 1 | -1/+1 |
* | Merge branch 'sg/subtree-signed-commits' | Junio C Hamano | 2018-03-08 | 1 | -6/+6 |
|\ |
|
| * | subtree: fix add and pull for GPG-signed commitssg/subtree-signed-commits | Stephen R Guglielmo | 2018-02-23 | 1 | -6/+6 |
* | | Correct mispellings of ".gitmodule" to ".gitmodules"rd/typofix | Robert P. J. Day | 2018-02-14 | 1 | -1/+1 |
|/ |
|
* | treewide: correct several "up-to-date" to "up to date"ma/up-to-date | Martin Ågren | 2017-08-23 | 1 | -1/+1 |
* | subtree: honour USE_ASCIIDOCTOR when setaw/contrib-subtree-doc-asciidoctor | A. Wilcox | 2017-06-27 | 1 | -7/+19 |
* | Spelling fixesvs/typofix | Ville Skyttä | 2016-08-11 | 1 | -1/+1 |
* | subtree: adjust function definitions to match CodingGuidelinesda/subtree-modernize | David Aguilar | 2016-07-27 | 1 | -68/+34 |
* | subtree: adjust style to match CodingGuidelines | David Aguilar | 2016-07-27 | 1 | -218/+357 |
* | subtree: fix "git subtree split --rejoin"da/subtree-2.9-regression | David Aguilar | 2016-07-26 | 2 | -0/+17 |
* | t7900-subtree.sh: fix quoting and broken && chains | David Aguilar | 2016-07-26 | 1 | -8/+8 |
* | Merge branch 'dw/subtree-split-do-not-drop-merge' | Junio C Hamano | 2016-02-03 | 2 | -2/+70 |
|\ |
|
| * | contrib/subtree: fix "subtree split" skipped-merge bugdw/subtree-split-do-not-drop-merge | Dave Ware | 2016-01-20 | 2 | -2/+70 |
* | | Merge branch 'dg/subtree-test' | Junio C Hamano | 2016-02-03 | 1 | -1/+5 |
|\ \ |
|
| * | | contrib/subtree: Make testing easierdg/subtree-test | David A. Greene | 2016-01-19 | 1 | -1/+5 |
| |/ |
|
* | | Merge branch 'rm/subtree-unwrap-tags' | Junio C Hamano | 2016-01-22 | 1 | -2/+8 |
|\ \
| |/
|/| |
|
| * | contrib/subtree: unwrap tag refsrm/subtree-unwrap-tags | Rob Mayoff | 2015-11-24 | 1 | -2/+8 |
* | | Merge branch 'dg/subtree-test-cleanup' | Jeff King | 2015-12-01 | 3 | -443/+956 |
|\ \ |
|
| * | | contrib/subtree: Handle '--prefix' argument with a slash appended | Techlive Zheng | 2015-11-13 | 2 | -1/+21 |
| * | | contrib/subtree: Make each test self-contained | Techlive Zheng | 2015-11-13 | 1 | -418/+840 |
| * | | contrib/subtree: Add split tests | Techlive Zheng | 2015-11-13 | 1 | -2/+15 |
| * | | contrib/subtree: Add merge tests | Techlive Zheng | 2015-11-13 | 1 | -1/+12 |
| * | | contrib/subtree: Add tests for subtree add | Techlive Zheng | 2015-11-13 | 1 | -0/+19 |
| * | | contrib/subtree: Add test for missing subtree | Techlive Zheng | 2015-11-13 | 1 | -0/+4 |
| * | | contrib/subtree: Clean and refactor test code | Techlive Zheng | 2015-11-13 | 2 | -55/+79 |
* | | | contrib/subtree: remove "push" command from the "todo" filefp/subtree-todo-update | Fabio Porcedda | 2015-11-06 | 1 | -2/+0 |
|/ / |
|
* | | contrib/subtree: respect spaces in a repository pathas/subtree-with-spaces | Alexey Shumkin | 2015-09-08 | 2 | -1/+48 |
* | | t7900-subtree: test the "space in a subdirectory name" case | Alexey Shumkin | 2015-09-08 | 2 | -73/+76 |
|/ |
|
* | Merge branch 'da/subtree-date-confusion' | Junio C Hamano | 2015-08-03 | 2 | -1/+5 |
|\ |
|
| * | contrib/subtree: ignore log.date configurationda/subtree-date-confusion | David Aguilar | 2015-07-23 | 2 | -1/+5 |
* | | Merge branch 'cb/subtree-tests-update' | Junio C Hamano | 2015-07-10 | 1 | -152/+150 |
|\ \ |
|
| * | | contrib/subtree: small tidy-up to testcb/subtree-tests-update | Charles Bailey | 2015-06-22 | 1 | -3/+1 |
| * | | contrib/subtree: fix broken &&-chains and revealed test error | Charles Bailey | 2015-06-22 | 1 | -4/+4 |
| * | | contrib/subtree: use tabs consitently for indentation in tests | Charles Bailey | 2015-06-22 | 1 | -147/+147 |
| |/ |
|
* | | Merge branch 'dl/subtree-avoid-tricky-echo' | Junio C Hamano | 2015-05-22 | 1 | -3/+10 |
|\ \ |
|
| * | | contrib/subtree: portability fix for string printingdl/subtree-avoid-tricky-echo | Danny Lin | 2015-05-08 | 1 | -3/+10 |
| |/ |
|
* | | contrib/subtree: there's no push --squashdl/subtree-push-no-squash | Danny Lin | 2015-05-07 | 2 | -2/+2 |
|/ |
|
* | subtree: fix AsciiDoc list item continuationsp/subtree-doc | Steffen Prohaska | 2015-01-06 | 1 | -105/+89 |
* | Documentation: typofixes | Thomas Ackermann | 2014-11-04 | 1 | -1/+1 |
* | subtree: add an install-html target | Sebastian Schuberth | 2014-10-15 | 2 | -3/+9 |
* | subtree: make "all" default target of Makefilejk/contrib-subtree-make-all | Jeff King | 2014-08-18 | 1 | -1/+4 |
* | Fix contrib/subtree Makefile to patch #! line | Charles Bailey | 2014-07-21 | 1 | -1/+7 |
* | Merge branch 'ep/shell-assign-and-export-vars' | Junio C Hamano | 2014-06-06 | 1 | -1/+2 |
|\ |
|
| * | scripts: "export VAR=VALUE" construct is not portable | Elia Pinto | 2014-05-23 | 1 | -1/+2 |
* | | Merge branch 'jd/subtree' | Junio C Hamano | 2014-06-06 | 2 | -16/+25 |
|\ \ |
|
| * | | contrib/subtree: allow adding an annotated tagjd/subtree | James Denholm | 2014-05-13 | 1 | -1/+2 |
| * | | contrib/subtree/Makefile: clean up rule for "clean" | James Denholm | 2014-05-06 | 1 | -3/+4 |
| * | | contrib/subtree/Makefile: clean up rules to generate documentation | James Denholm | 2014-05-06 | 1 | -5/+8 |
| * | | contrib/subtree/Makefile: s/libexecdir/gitexecdir/ | James Denholm | 2014-05-06 | 1 | -3/+3 |