summaryrefslogtreecommitdiff
path: root/contrib/subtree
AgeCommit message (Expand)AuthorFilesLines
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-92/+86
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-115/+120
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