summaryrefslogtreecommitdiff
path: root/contrib/subtree
AgeCommit message (Expand)AuthorFilesLines
2022-02-01subtree: force merge commitLibravatar Thomas Koutcher1-2/+2
2022-01-10Merge branch 'jl/subtree-check-parents-argument-passing-fix'Libravatar Junio C Hamano1-4/+3
2022-01-04subtree: fix argument handling in check_parentsLibravatar James Limbouris1-4/+3
2021-12-13tests: fix broken &&-chains in `$(...)` command substitutionsLibravatar Eric Sunshine1-1/+1
2021-06-15subtree: fix assumption about the directory separatorLibravatar Johannes Schindelin1-3/+4
2021-06-15subtree: fix the GIT_EXEC_PATH sanity check to work on WindowsLibravatar Johannes Schindelin1-1/+4
2021-04-28subtree: be stricter about validating flagsLibravatar Luke Shumaker2-25/+175
2021-04-28subtree: push: allow specifying a local rev other than HEADLibravatar Luke Shumaker3-13/+47
2021-04-28subtree: allow 'split' flags to be passed to 'push'Libravatar Luke Shumaker3-12/+223
2021-04-28subtree: allow --squash to be used with --rejoinLibravatar Luke Shumaker3-24/+96
2021-04-28subtree: give the docs a once-overLibravatar Luke Shumaker3-93/+87
2021-04-28subtree: have $indent actually affect indentationLibravatar Luke Shumaker1-18/+24
2021-04-28subtree: don't let debug and progress output clashLibravatar Luke Shumaker1-1/+21
2021-04-28subtree: add comments and sanity checksLibravatar Luke Shumaker1-3/+61
2021-04-28subtree: remove duplicate checkLibravatar Luke Shumaker1-4/+0
2021-04-28subtree: parse revs in individual cmd_ functionsLibravatar Luke Shumaker1-38/+24
2021-04-28subtree: use "^{commit}" instead of "^0"Libravatar Luke Shumaker1-2/+2
2021-04-28subtree: don't fuss with PATHLibravatar Luke Shumaker1-2/+16
2021-04-28subtree: use "$*" instead of "$@" as appropriateLibravatar Luke Shumaker1-3/+3
2021-04-28subtree: use more explicit variable names for cmdline argsLibravatar Luke Shumaker1-66/+66
2021-04-28subtree: use git-sh-setup's `say`Libravatar Luke Shumaker1-15/+7
2021-04-28subtree: use `git merge-base --is-ancestor`Libravatar Luke Shumaker1-15/+1
2021-04-28subtree: drop support for git < 1.7Libravatar Luke Shumaker1-15/+4
2021-04-28subtree: more consistent error propagationLibravatar Luke Shumaker1-14/+14
2021-04-28subtree: don't have loose code outside of a functionLibravatar Luke Shumaker1-120/+125
2021-04-28subtree: t7900: add porcelain tests for 'pull' and 'push'Libravatar Luke Shumaker1-0/+127
2021-04-28subtree: t7900: add a test for the -h flagLibravatar Luke Shumaker1-0/+7
2021-04-28subtree: t7900: rename last_commit_message to last_commit_subjectLibravatar Luke Shumaker1-13/+13
2021-04-28subtree: t7900: fix 'verify one file change per commit'Libravatar Luke Shumaker1-40/+6
2021-04-28subtree: t7900: delete some dead codeLibravatar Luke Shumaker1-11/+1
2021-04-28subtree: t7900: use 'test' for string equalityLibravatar Luke Shumaker1-36/+24
2021-04-28subtree: t7900: comment subtree_test_create_repoLibravatar Luke Shumaker1-6/+8
2021-04-28subtree: t7900: use consistent formattingLibravatar Luke Shumaker1-35/+35
2021-04-28subtree: t7900: use test-lib.sh's test_countLibravatar Luke Shumaker1-336/+300
2021-04-28subtree: t7900: update for having the default branch name be 'main'Libravatar Luke Shumaker1-58/+59
2020-08-24Merge branch 'dl/subtree-docs'Libravatar Junio C Hamano1-3/+3
2020-08-18contrib/subtree: document 'push' does not take '--squash'Libravatar Danny Lin1-2/+2
2020-08-18contrib/subtree: fix "unsure" for --message in the documentLibravatar Danny Lin1-1/+1
2020-08-03Revert "contrib: subtree: adjust test to change in fmt-merge-msg"Libravatar Emily Shaffer1-4/+2
2020-06-30contrib: subtree: adjust test to change in fmt-merge-msgLibravatar Đoàn Trần Công Danh1-2/+4
2020-04-08subtree: fix build with AsciiDoctor 2Libravatar Johannes Schindelin1-2/+4
2019-03-12contrib/subtree: ensure only one rev is providedLibravatar Denton Liu1-12/+12
2018-10-30Merge branch 'ch/subtree-build'Libravatar Junio C Hamano1-0/+4
2018-10-18Revert "subtree: make install targets depend on build targets"Libravatar Junio C Hamano1-3/+3
2018-10-16subtree: make install targets depend on build targetsLibravatar Christian Hesse1-3/+3
2018-10-12subtree: performance improvement for finding unexpected parent commitsLibravatar Roger Strain1-1/+1
2018-10-10subtree: add build targets 'man' and 'html'Libravatar Christian Hesse1-0/+4
2018-10-07subtree: improve decision on merges kept in splitLibravatar Strain, Roger L1-2/+19
2018-10-07subtree: use commits before rejoins for splitsLibravatar Strain, Roger L1-6/+20
2018-10-07subtree: make --ignore-joins pay attention to addsLibravatar Strain, Roger L1-7/+7