File tree Expand file tree Collapse file tree 3 files changed +57
-0
lines changed Expand file tree Collapse file tree 3 files changed +57
-0
lines changed Original file line number Diff line number Diff line change
1
+ name : matt-build branch update
2
+
3
+ on :
4
+ push :
5
+ branches :
6
+ - gpg-support
7
+ - gh-forge-improvements
8
+
9
+ jobs :
10
+ rebuild-matt-build-branch :
11
+ runs-on : ubuntu-latest
12
+ steps :
13
+ - uses : actions/checkout@v4
14
+ with :
15
+ ref : ' matt-build'
16
+
17
+ - name : Rebuild branch
18
+ run : |
19
+ git config user.email "[email protected] "
20
+ git config user.name "Matt Hammerly"
21
+ ./matt-build.sh
22
+ git push -f origin matt-build
Original file line number Diff line number Diff line change
1
+ # Personal build of git-branchless
2
+
3
+ Provided with no warranty for my own use.
4
+
5
+ Branches:
6
+ - ` gpg-support ` : support for commit signatures
7
+ - Requires a local checkout of ` git2-ext ` at ` ../git2-ext ` which:
8
+ - updates its ` git2 ` dependency to 0.20.0
9
+ - updates its ` git-fixture ` dependency to point at that project's ` main ` branch on GitHub
10
+ - ` gh-forge-improvements ` : new GitHub backend for ` git submit `
11
+ - ` matt-build ` : other branches cherry-picked into the same branch for builds
12
+
13
+ ` ./matt-build.sh ` will rebuild the ` matt-build ` branch after rebases or updates to the other branches.
14
+
15
+ To install:
16
+ - clone ` gitext-rs/git2-ext ` into ` ../git2-ext ` and update dependencies as described above
17
+ - run ` cargo +stable install --path git-branchless ` from this repository's root (assuming rustup manages your ` cargo ` )
18
+ - use ` git branchless init ` in each repository like normal
19
+
20
+ # Original README
21
+
1
22
<p align =" center " ><img width =" 147 " height =" 147 " src =" https://user-images.githubusercontent.com/454057/144287756-8570ba1b-b9f1-46de-9236-ca17db246856.png " alt =" git-branchless logo " /></p >
2
23
3
24
<h1 align =" center " >Branchless workflow for Git</h1 >
Original file line number Diff line number Diff line change
1
+ #! /bin/bash
2
+
3
+ stub_sha=$( git cherry master -v | head -n 1 | cut -d ' ' -f 2)
4
+ git checkout matt-build || true
5
+ git reset --hard $stub_sha || true
6
+
7
+ # if git branchless is installed, get rid of the old stack
8
+ git hide ' descendants(.) - .' || true
9
+
10
+ for branch in gh-forge-improvements gpg-support
11
+ do
12
+ merge_base=$( git merge-base master $branch )
13
+ git cherry-pick $merge_base ..$branch
14
+ done
You can’t perform that action at this time.
0 commit comments