aboutsummaryrefslogtreecommitdiffstats
path: root/contrib/subtree/git-subtree.sh
AgeCommit message (Expand)AuthorFilesLines
2025-09-11contrib/subtree: fix split with squashed subtreesColin Stagner1-8/+28
2025-06-04contrib/subtree: add -S/--gpg-signPatrik Weiskircher1-13/+19
2025-06-04contrib/subtree: parse using --stuck-longPatrik Weiskircher1-21/+13
2024-10-10contrib: fix typosAndrew Kreimer1-1/+1
2024-01-25subtree: fix split processing with multiple subtrees presentZach FettersMoore1-1/+29
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-06subtree: disallow --no-{help,quiet,debug,branch,message}René Scharfe1-5/+5
2023-05-08subtree: support long global flagsJosh Soref1-2/+2
2022-10-21subtree: fix split after annotated tag was squashed mergedPhilippe Blain1-8/+18
2022-10-21subtree: fix squash merging after annotated tag was squashed mergedPhilippe Blain1-13/+43
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 Blain1-30/+30
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-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-04subtree: fix argument handling in check_parentsJames Limbouris1-4/+3
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 Shumaker1-25/+64
2021-04-28subtree: push: allow specifying a local rev other than HEADLuke Shumaker1-7/+17
2021-04-28subtree: allow 'split' flags to be passed to 'push'Luke Shumaker1-3/+3
2021-04-28subtree: allow --squash to be used with --rejoinLuke Shumaker1-8/+29
2021-04-28subtree: give the docs a once-overLuke Shumaker1-2/+2
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
2019-03-12contrib/subtree: ensure only one rev is providedDenton Liu1-12/+12
2018-10-12subtree: performance improvement for finding unexpected parent commitsRoger Strain1-1/+1
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-02-23subtree: fix add and pull for GPG-signed commitsStephen R Guglielmo1-6/+6
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 Aguilar1-0/+1
2016-02-03Merge branch 'dw/subtree-split-do-not-drop-merge'Junio C Hamano1-2/+10
2016-01-22Merge branch 'rm/subtree-unwrap-tags'Junio C Hamano1-2/+8
2016-01-20contrib/subtree: fix "subtree split" skipped-merge bugDave Ware1-2/+10
2015-11-24contrib/subtree: unwrap tag refsRob Mayoff1-2/+8
2015-11-13contrib/subtree: Handle '--prefix' argument with a slash appendedTechlive Zheng1-1/+1
2015-09-08contrib/subtree: respect spaces in a repository pathAlexey Shumkin1-1/+1
2015-09-08t7900-subtree: test the "space in a subdirectory name" caseAlexey Shumkin1-1/+1
2015-08-03Merge branch 'da/subtree-date-confusion'Junio C Hamano1-1/+1
2015-07-23contrib/subtree: ignore log.date configurationDavid Aguilar1-1/+1
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 Lin1-1/+1
2014-05-13contrib/subtree: allow adding an annotated tagJames Denholm1-1/+2
2014-03-17subtree: initialize "prefix" variableJeff King1-0/+1
2014-01-13subtree: fix argument validation in add/pull/pushAnthony Baire1-6/+16
2013-08-01Merge branch 'lf/echo-n-is-not-portable'Junio C Hamano1-1/+1
2013-07-29Avoid using `echo -n` anywhereLukas Fleischer1-1/+1
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-02-05contrib/subtree: fix synopsisDavid A. Greene1-0/+6
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 Zheng1-1/+1
2012-04-09Add 'contrib/subtree/' from commit 'd3a04e06c77d57978bb5230361c64946232cc346'David A. Greene1-0/+712