aboutsummaryrefslogtreecommitdiffstats
path: root/contrib/subtree
AgeCommit message (Expand)AuthorFilesLines
2024-03-16contrib/subtree/t: avoid redundant use of catBeat Bolli1-1/+1
2024-01-25subtree: fix split processing with multiple subtrees presentZach FettersMoore2-1/+69
2023-11-11contrib/subtree: convert subtree type check to use case statementPatrick Steinhardt1-4/+10
2023-11-11contrib/subtree: stop using `-o` to test for number of argsPatrick Steinhardt1-5/+11
2023-11-11global: convert trivial usages of `test <expr> -a/-o <expr>`Patrick Steinhardt1-2/+2
2023-08-06parse-options: show negatability of options in short helpRené Scharfe1-1/+1
2023-08-06subtree: disallow --no-{help,quiet,debug,branch,message}René Scharfe1-5/+5
2023-05-08subtree: support long global flagsJosh Soref1-2/+2
2023-03-09test: don't print aggregate-results commandFelipe Contreras1-1/+1
2023-03-09test: simplify counts aggregationFelipe Contreras1-3/+1
2022-10-21subtree: fix split after annotated tag was squashed mergedPhilippe Blain3-9/+36
2022-10-21subtree: fix squash merging after annotated tag was squashed mergedPhilippe Blain3-15/+86
2022-10-21subtree: process 'git-subtree-split' trailer in separate functionPhilippe Blain1-4/+11
2022-10-21subtree: use named variables instead of "$@" in cmd_pullPhilippe Blain1-2/+4
2022-10-21subtree: define a variable before its first use in 'find_latest_squash'Philippe Blain1-1/+1
2022-10-21subtree: prefix die messages with 'fatal'Philippe Blain2-36/+36
2022-10-21subtree: add 'die_incompatible_opt' function to reduce duplicationPhilippe Blain1-12/+20
2022-10-21subtree: use 'git rev-parse --verify [--quiet]' for better error messagesPhilippe Blain1-3/+3
2022-09-21t/Makefile: remove 'test-results' on 'make clean'SZEDER Gábor1-0/+1
2022-07-27t/Makefile: don't remove test-results in "clean-except-prove-cache"Ævar Arnfjörð Bjarmason1-1/+1
2022-06-28git-sh-setup.sh: remove "say" function, change last usersÆvar Arnfjörð Bjarmason1-3/+12
2022-02-01subtree: force merge commitThomas Koutcher1-2/+2
2022-01-10Merge branch 'jl/subtree-check-parents-argument-passing-fix'Junio C Hamano1-4/+3
2022-01-04subtree: fix argument handling in check_parentsJames Limbouris1-4/+3
2021-12-13tests: fix broken &&-chains in `$(...)` command substitutionsEric Sunshine1-1/+1
2021-06-15subtree: fix assumption about the directory separatorJohannes Schindelin1-3/+4
2021-06-15subtree: fix the GIT_EXEC_PATH sanity check to work on WindowsJohannes Schindelin1-1/+4
2021-04-28subtree: be stricter about validating flagsLuke Shumaker2-25/+175
2021-04-28subtree: push: allow specifying a local rev other than HEADLuke Shumaker3-13/+47
2021-04-28subtree: allow 'split' flags to be passed to 'push'Luke Shumaker3-12/+223
2021-04-28subtree: allow --squash to be used with --rejoinLuke Shumaker3-24/+96
2021-04-28subtree: give the docs a once-overLuke Shumaker3-93/+87
2021-04-28subtree: have $indent actually affect indentationLuke Shumaker1-18/+24
2021-04-28subtree: don't let debug and progress output clashLuke Shumaker1-1/+21
2021-04-28subtree: add comments and sanity checksLuke Shumaker1-3/+61
2021-04-28subtree: remove duplicate checkLuke Shumaker1-4/+0
2021-04-28subtree: parse revs in individual cmd_ functionsLuke Shumaker1-38/+24
2021-04-28subtree: use "^{commit}" instead of "^0"Luke Shumaker1-2/+2
2021-04-28subtree: don't fuss with PATHLuke Shumaker1-2/+16
2021-04-28subtree: use "$*" instead of "$@" as appropriateLuke Shumaker1-3/+3
2021-04-28subtree: use more explicit variable names for cmdline argsLuke Shumaker1-66/+66
2021-04-28subtree: use git-sh-setup's `say`Luke Shumaker1-15/+7
2021-04-28subtree: use `git merge-base --is-ancestor`Luke Shumaker1-15/+1
2021-04-28subtree: drop support for git < 1.7Luke Shumaker1-15/+4
2021-04-28subtree: more consistent error propagationLuke Shumaker1-14/+14
2021-04-28subtree: don't have loose code outside of a functionLuke Shumaker1-120/+125
2021-04-28subtree: t7900: add porcelain tests for 'pull' and 'push'Luke Shumaker1-0/+127
2021-04-28subtree: t7900: add a test for the -h flagLuke Shumaker1-0/+7
2021-04-28subtree: t7900: rename last_commit_message to last_commit_subjectLuke Shumaker1-13/+13
2021-04-28subtree: t7900: fix 'verify one file change per commit'Luke Shumaker1-40/+6
2021-04-28subtree: t7900: delete some dead codeLuke Shumaker1-11/+1
2021-04-28subtree: t7900: use 'test' for string equalityLuke Shumaker1-36/+24
2021-04-28subtree: t7900: comment subtree_test_create_repoLuke Shumaker1-6/+8
2021-04-28subtree: t7900: use consistent formattingLuke Shumaker1-35/+35
2021-04-28subtree: t7900: use test-lib.sh's test_countLuke Shumaker1-336/+300
2021-04-28subtree: t7900: update for having the default branch name be 'main'Luke Shumaker1-58/+59
2020-08-24Merge branch 'dl/subtree-docs'Junio C Hamano1-3/+3
2020-08-18contrib/subtree: document 'push' does not take '--squash'Danny Lin1-2/+2
2020-08-18contrib/subtree: fix "unsure" for --message in the documentDanny Lin1-1/+1
2020-08-03Revert "contrib: subtree: adjust test to change in fmt-merge-msg"Emily Shaffer1-4/+2
2020-06-30contrib: subtree: adjust test to change in fmt-merge-msgĐoàn Trần Công Danh1-2/+4
2020-04-08subtree: fix build with AsciiDoctor 2Johannes Schindelin1-2/+4
2019-03-12contrib/subtree: ensure only one rev is providedDenton Liu1-12/+12
2018-10-30Merge branch 'ch/subtree-build'Junio C Hamano1-0/+4
2018-10-18Revert "subtree: make install targets depend on build targets"Junio C Hamano1-3/+3
2018-10-16subtree: make install targets depend on build targetsChristian Hesse1-3/+3
2018-10-12subtree: performance improvement for finding unexpected parent commitsRoger Strain1-1/+1
2018-10-10subtree: add build targets 'man' and 'html'Christian Hesse1-0/+4
2018-10-07subtree: improve decision on merges kept in splitStrain, Roger L1-2/+19
2018-10-07subtree: use commits before rejoins for splitsStrain, Roger L1-6/+20
2018-10-07subtree: make --ignore-joins pay attention to addsStrain, Roger L1-7/+7
2018-10-07subtree: refactor split of a commit into standalone methodStrain, Roger L1-36/+42
2018-07-30subtree test: simplify preparation of expected resultsJonathan Nieder1-89/+30
2018-07-30subtree test: add missing && to &&-chainJonathan Nieder1-1/+1
2018-03-08Merge branch 'sg/subtree-signed-commits'Junio C Hamano1-6/+6
2018-02-23subtree: fix add and pull for GPG-signed commitsStephen R Guglielmo1-6/+6
2018-02-14Correct mispellings of ".gitmodule" to ".gitmodules"Robert P. J. Day1-1/+1
2017-08-23treewide: correct several "up-to-date" to "up to date"Martin Ågren1-1/+1
2017-06-27subtree: honour USE_ASCIIDOCTOR when setA. Wilcox1-7/+19
2016-08-11Spelling fixesVille Skyttä1-1/+1
2016-07-27subtree: adjust function definitions to match CodingGuidelinesDavid Aguilar1-68/+34
2016-07-27subtree: adjust style to match CodingGuidelinesDavid Aguilar1-218/+357
2016-07-26subtree: fix "git subtree split --rejoin"David Aguilar2-0/+17
2016-07-26t7900-subtree.sh: fix quoting and broken && chainsDavid Aguilar1-8/+8
2016-02-03Merge branch 'dw/subtree-split-do-not-drop-merge'Junio C Hamano2-2/+70
2016-02-03Merge branch 'dg/subtree-test'Junio C Hamano1-1/+5
2016-01-22Merge branch 'rm/subtree-unwrap-tags'Junio C Hamano1-2/+8
2016-01-20contrib/subtree: fix "subtree split" skipped-merge bugDave Ware2-2/+70
2016-01-19contrib/subtree: Make testing easierDavid A. Greene1-1/+5
2015-12-01Merge branch 'dg/subtree-test-cleanup'Jeff King3-443/+956
2015-11-24contrib/subtree: unwrap tag refsRob Mayoff1-2/+8
2015-11-13contrib/subtree: Handle '--prefix' argument with a slash appendedTechlive Zheng2-1/+21
2015-11-13contrib/subtree: Make each test self-containedTechlive Zheng1-418/+840
2015-11-13contrib/subtree: Add split testsTechlive Zheng1-2/+15
2015-11-13contrib/subtree: Add merge testsTechlive Zheng1-1/+12
2015-11-13contrib/subtree: Add tests for subtree addTechlive Zheng1-0/+19
2015-11-13contrib/subtree: Add test for missing subtreeTechlive Zheng1-0/+4
2015-11-13contrib/subtree: Clean and refactor test codeTechlive Zheng2-55/+79
2015-11-06contrib/subtree: remove "push" command from the "todo" fileFabio Porcedda1-2/+0
2015-09-08contrib/subtree: respect spaces in a repository pathAlexey Shumkin2-1/+48
2015-09-08t7900-subtree: test the "space in a subdirectory name" caseAlexey Shumkin2-73/+76
2015-08-03Merge branch 'da/subtree-date-confusion'Junio C Hamano2-1/+5
2015-07-23contrib/subtree: ignore log.date configurationDavid Aguilar2-1/+5
2015-07-10Merge branch 'cb/subtree-tests-update'Junio C Hamano1-152/+150
2015-06-22contrib/subtree: small tidy-up to testCharles Bailey1-3/+1
2015-06-22contrib/subtree: fix broken &&-chains and revealed test errorCharles Bailey1-4/+4
2015-06-22contrib/subtree: use tabs consitently for indentation in testsCharles Bailey1-147/+147
2015-05-22Merge branch 'dl/subtree-avoid-tricky-echo'Junio C Hamano1-3/+10
2015-05-08contrib/subtree: portability fix for string printingDanny Lin1-3/+10
2015-05-07contrib/subtree: there's no push --squashDanny Lin2-2/+2
2015-01-06subtree: fix AsciiDoc list item continuationSteffen Prohaska1-105/+89
2014-11-04Documentation: typofixesThomas Ackermann1-1/+1
2014-10-15subtree: add an install-html targetSebastian Schuberth2-3/+9
2014-08-18subtree: make "all" default target of MakefileJeff King1-1/+4
2014-07-21Fix contrib/subtree Makefile to patch #! lineCharles Bailey1-1/+7
2014-06-06Merge branch 'ep/shell-assign-and-export-vars'Junio C Hamano1-1/+2
2014-06-06Merge branch 'jd/subtree'Junio C Hamano2-16/+25
2014-06-03Merge branch 'ep/shell-command-substitution'Junio C Hamano1-1/+1
2014-05-23scripts: "export VAR=VALUE" construct is not portableElia Pinto1-1/+2
2014-05-13contrib/subtree: allow adding an annotated tagJames Denholm1-1/+2
2014-05-06contrib/subtree/Makefile: clean up rule for "clean"James Denholm1-3/+4
2014-05-06contrib/subtree/Makefile: clean up rules to generate documentationJames Denholm1-5/+8
2014-05-06contrib/subtree/Makefile: s/libexecdir/gitexecdir/James Denholm1-3/+3
2014-05-06contrib/subtree/Makefile: use GIT-VERSION-FILEJames Denholm1-3/+8
2014-05-06contrib/subtree/Makefile: scrap unused $(gitdir)James Denholm1-1/+0
2014-04-23t7900-subtree.sh: use the $( ... ) construct for command substitutionElia Pinto1-1/+1
2014-03-17subtree: initialize "prefix" variableJeff King1-0/+1
2014-01-13subtree: fix argument validation in add/pull/pushAnthony Baire2-13/+23
2013-11-04Merge branch 'jk/subtree-install-fix'Junio C Hamano1-1/+6
2013-10-30subtree: add makefile target for html docsJeff King1-1/+6
2013-08-01Merge branch 'ob/typofixes'Junio C Hamano1-1/+1
2013-08-01Merge branch 'ms/subtree-install-fix'Junio C Hamano1-0/+1
2013-08-01Merge branch 'lf/echo-n-is-not-portable'Junio C Hamano2-5/+5
2013-07-30contrib/subtree: Fix make install targetMichal Sojka1-0/+1
2013-07-29many small typofixesOndřej Bílka1-1/+1
2013-07-29Avoid using `echo -n` anywhereLukas Fleischer2-5/+5
2013-06-05Merge branch 'dm/unbash-subtree'Junio C Hamano1-1/+1
2013-05-21contrib/git-subtree: Use /bin/sh interpreter instead of /bin/bashDmitry Marakasov1-1/+1
2013-05-01contrib/subtree: don't delete remote branches if split failsJohn Keeping1-1/+2
2013-04-12contrib/subtree: fix spelling of accidentallyStefano Lattarini1-1/+1
2013-02-14Merge branch 'dg/subtree-fixes'Junio C Hamano4-66/+40
2013-02-05contrib/subtree: make the manual directory if neededJesper L. Nielsen1-0/+1
2013-02-05contrib/subtree: honor DESTDIRAdam Tkac1-2/+2
2013-02-05contrib/subtree: fix synopsisDavid A. Greene2-1/+8
2013-02-05contrib/subtree: better error handling for 'subtree add'David A. Greene1-3/+9
2013-02-05contrib/subtree: use %B for split subject/bodyTechlive Zheng2-5/+20
2013-02-05contrib/subtree: remove test number commentsDavid A. Greene1-55/+0
2012-12-22git-subtree: fix typo in manpageMichael Schubert1-1/+1
2012-12-22git-subtree: ignore git-subtree executableMichael Schubert1-0/+1
2012-04-09Fix git-subtree install instructionsDavid A. Greene1-12/+18
2012-04-09Use git-subtree test MakefileDavid A. Greene1-1/+1
2012-04-09Add subtree test MakefileDavid A. Greene1-0/+69
2012-04-09Install git-subtree from contribDavid A. Greene1-20/+21
2012-04-09Use configure settings for git-subtreeDavid A. Greene1-0/+3
2012-04-09Use project config filesDavid A. Greene1-3/+6
2012-04-09Remove unnecessary git-subtree filesDavid A. Greene6-143/+0
2012-04-09Set TEST_DIRECTORYDavid A. Greene1-2/+4
2012-04-09Add 'contrib/subtree/' from commit 'd3a04e06c77d57978bb5230361c64946232cc346'David A. Greene15-0/+2196
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-09 15:47:28 +0000