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