Merge branch 'master' of bitbucket.org:thefoldwithin/git-sigil

This commit is contained in:
Mark Randall Havens 2025-06-07 01:27:40 -05:00
commit 5c5ba832e3
4 changed files with 56 additions and 200 deletions

View file

@ -6,26 +6,45 @@
- **Local Repo Path**: `/mnt/c/Downloads/git-sigil`
- **Remote Label**: `bitbucket`
- **Default Branch**: `master`
- **This Commit Date**: `2025-06-07 01:27:05`
<<<<<<< HEAD
- **This Commit Date**: `2025-06-07 00:15:13`
=======
- **This Commit Date**: `2025-06-06 12:26:06`
>>>>>>> be7726405b6412ae5af5144f9e2cf4d13bd32aeb
---
## 📦 Commit Info
- **This Commit Timestamp**: `2025-06-07 01:27:05`
- **Last Commit SHA**: `da10fb00b3516e978dc361017b1d994a2b5a2a53`
- **Last Commit Message**: `Post-GitHub sync at 2025-06-07 01:18:36`
<<<<<<< HEAD
- **This Commit Timestamp**: `2025-06-07 00:15:13`
- **Last Commit SHA**: `04cd7f309df3cf15dda8f1512da09173c9dc24a2`
- **Last Commit Message**: `Post-GitLab sync at 2025-06-07 00:07:23`
- **Last Commit Author**: `Mark Randall Havens <mark.r.havens@gmail.com>`
- **Last Commit Date**: `Sat Jun 7 01:26:32 2025 -0500`
- **This Commit URL**: [https://bitbucket.org/thefoldwithin/git-sigil/commits/da10fb00b3516e978dc361017b1d994a2b5a2a53](https://bitbucket.org/thefoldwithin/git-sigil/commits/da10fb00b3516e978dc361017b1d994a2b5a2a53)
- **Last Commit Date**: `Sat Jun 7 00:14:58 2025 -0500`
- **This Commit URL**: [https://bitbucket.org/thefoldwithin/git-sigil/commits/04cd7f309df3cf15dda8f1512da09173c9dc24a2](https://bitbucket.org/thefoldwithin/git-sigil/commits/04cd7f309df3cf15dda8f1512da09173c9dc24a2)
=======
- **This Commit Timestamp**: `2025-06-06 12:26:06`
- **Last Commit SHA**: `ef06f7cf0f4ecb039cfb8c82b2b6b684abc6b9b1`
- **Last Commit Message**: `Post-GitLab sync at 2025-06-06 12:19:09`
- **Last Commit Author**: `Mark Randall Havens <mark.r.havens@gmail.com>`
- **Last Commit Date**: `Fri Jun 6 12:25:55 2025 -0500`
- **This Commit URL**: [https://bitbucket.org/thefoldwithin/git-sigil/commits/ef06f7cf0f4ecb039cfb8c82b2b6b684abc6b9b1](https://bitbucket.org/thefoldwithin/git-sigil/commits/ef06f7cf0f4ecb039cfb8c82b2b6b684abc6b9b1)
>>>>>>> be7726405b6412ae5af5144f9e2cf4d13bd32aeb
---
## 📊 Repo Status
- **Total Commits**: `861`
- **Tracked Files**: `115`
<<<<<<< HEAD
- **Total Commits**: `784`
- **Tracked Files**: `113`
- **Uncommitted Changes**: `Yes`
=======
- **Total Commits**: `756`
- **Tracked Files**: `81`
- **Uncommitted Changes**: `No`
>>>>>>> be7726405b6412ae5af5144f9e2cf4d13bd32aeb
- **Latest Tag**: `None`
---

View file

@ -6,26 +6,45 @@
- **Local Repo Path**: `/mnt/c/Downloads/git-sigil`
- **Remote Label**: `gitlab`
- **Default Branch**: `master`
- **Repo Created**: `2025-06-07 01:25:22`
<<<<<<< HEAD
- **Repo Created**: `2025-06-07 00:14:50`
=======
- **Repo Created**: `2025-06-06 12:25:52`
>>>>>>> be7726405b6412ae5af5144f9e2cf4d13bd32aeb
---
## 📦 Commit Info
- **This Commit Timestamp**: `2025-06-07 01:25:22`
- **This Commit SHA**: `5b45a969c05f00359a3c8e4a4d2c162025a6e05f`
- **Last Commit Message**: `Post-Forgejo sync at 2025-06-07 01:18:36`
<<<<<<< HEAD
- **This Commit Timestamp**: `2025-06-07 00:14:50`
- **This Commit SHA**: `ac3616d769390092d59b246aed17a1038c211a7f`
- **Last Commit Message**: `Post-Forgejo sync at 2025-06-07 00:07:23`
- **Last Commit Author**: `Mark Randall Havens <mark.r.havens@gmail.com>`
- **Last Commit Date**: `Sat Jun 7 01:25:11 2025 -0500`
- **This Commit URL**: [https://gitlab.com/mrhavens/git-sigil/-/commit/5b45a969c05f00359a3c8e4a4d2c162025a6e05f](https://gitlab.com/mrhavens/git-sigil/-/commit/5b45a969c05f00359a3c8e4a4d2c162025a6e05f)
- **Last Commit Date**: `Sat Jun 7 00:14:38 2025 -0500`
- **This Commit URL**: [https://gitlab.com/mrhavens/git-sigil/-/commit/ac3616d769390092d59b246aed17a1038c211a7f](https://gitlab.com/mrhavens/git-sigil/-/commit/ac3616d769390092d59b246aed17a1038c211a7f)
=======
- **This Commit Timestamp**: `2025-06-06 12:25:52`
- **This Commit SHA**: `e8fe71090f582b8025cf8f9fc80ecc958f8f0ea3`
- **Last Commit Message**: `Post-Forgejo sync at 2025-06-06 12:19:09`
- **Last Commit Author**: `Mark Randall Havens <mark.r.havens@gmail.com>`
- **Last Commit Date**: `Fri Jun 6 12:25:42 2025 -0500`
- **This Commit URL**: [https://gitlab.com/mrhavens/git-sigil/-/commit/e8fe71090f582b8025cf8f9fc80ecc958f8f0ea3](https://gitlab.com/mrhavens/git-sigil/-/commit/e8fe71090f582b8025cf8f9fc80ecc958f8f0ea3)
>>>>>>> be7726405b6412ae5af5144f9e2cf4d13bd32aeb
---
## 📊 Repo Status
- **Total Commits**: `855`
- **Tracked Files**: `115`
<<<<<<< HEAD
- **Total Commits**: `782`
- **Tracked Files**: `113`
- **Uncommitted Changes**: `Yes`
=======
- **Total Commits**: `754`
- **Tracked Files**: `81`
- **Uncommitted Changes**: `No`
>>>>>>> be7726405b6412ae5af5144f9e2cf4d13bd32aeb
- **Latest Tag**: `None`
---

View file

@ -139,53 +139,4 @@
=======
[2025-06-06 12:25:42] Forgejo: https://remember.thefoldwithin.earth/mrhavens/git-sigil
[2025-06-06 12:25:55] GitLab: https://gitlab.com/mrhavens/git-sigil
[2025-06-06 12:26:12] Bitbucket: https://bitbucket.org/thefoldwithin/git-sigil
>>>>>>> 4b323cbd7da16625ba04d2a7e8db3532f84bc1e0
[2025-06-07 00:42:56] Local:
[2025-06-07 00:43:05] Radicle: RID=rad:z3FEj7rF8gZw9eFksCuiN43qjzrex, Peer ID=z6Mkw5s3ppo26C7y7tGK5MD8n2GqTHS582PPpeX5Xqbu2Mpz
CLI: rad inspect rad:z3FEj7rF8gZw9eFksCuiN43qjzrex # View project details
CLI: git ls-tree -r --name-only HEAD # View file structure
[2025-06-07 00:43:10] Forgejo: https://remember.thefoldwithin.earth/mrhavens/git-sigil
[2025-06-07 00:43:32] GitLab: https://gitlab.com/mrhavens/git-sigil
[2025-06-07 00:43:48] Bitbucket: https://bitbucket.org/thefoldwithin/git-sigil
[2025-06-07 00:44:05] GitHub: https://github.com/mrhavens/git-sigil
[2025-06-07 00:44:17] Local:
[2025-06-07 00:44:27] Radicle: RID=rad:z3FEj7rF8gZw9eFksCuiN43qjzrex, Peer ID=z6Mkw5s3ppo26C7y7tGK5MD8n2GqTHS582PPpeX5Xqbu2Mpz
CLI: rad inspect rad:z3FEj7rF8gZw9eFksCuiN43qjzrex # View project details
CLI: git ls-tree -r --name-only HEAD # View file structure
[2025-06-07 00:44:32] Forgejo: https://remember.thefoldwithin.earth/mrhavens/git-sigil
[2025-06-07 00:44:51] GitLab: https://gitlab.com/mrhavens/git-sigil
[2025-06-07 00:45:08] Bitbucket: https://bitbucket.org/thefoldwithin/git-sigil
[2025-06-07 00:45:22] GitHub: https://github.com/mrhavens/git-sigil
[2025-06-07 00:45:32] Local:
[2025-06-07 00:46:02] Radicle: RID=rad:z3FEj7rF8gZw9eFksCuiN43qjzrex, Peer ID=z6Mkw5s3ppo26C7y7tGK5MD8n2GqTHS582PPpeX5Xqbu2Mpz
CLI: rad inspect rad:z3FEj7rF8gZw9eFksCuiN43qjzrex # View project details
CLI: git ls-tree -r --name-only HEAD # View file structure
[2025-06-07 00:46:07] Forgejo: https://remember.thefoldwithin.earth/mrhavens/git-sigil
[2025-06-07 00:46:33] GitLab: https://gitlab.com/mrhavens/git-sigil
[2025-06-07 00:47:04] Bitbucket: https://bitbucket.org/thefoldwithin/git-sigil
[2025-06-07 00:47:28] GitHub: https://github.com/mrhavens/git-sigil
[2025-06-07 01:19:11] Local:
[2025-06-07 01:20:53] Radicle: RID=rad:z3FEj7rF8gZw9eFksCuiN43qjzrex, Peer ID=z6Mkw5s3ppo26C7y7tGK5MD8n2GqTHS582PPpeX5Xqbu2Mpz
CLI: rad inspect rad:z3FEj7rF8gZw9eFksCuiN43qjzrex # View project details
CLI: git ls-tree -r --name-only HEAD # View file structure
[2025-06-07 01:21:08] Forgejo: https://remember.thefoldwithin.earth/mrhavens/git-sigil
[2025-06-07 01:21:32] GitLab: https://gitlab.com/mrhavens/git-sigil
[2025-06-07 01:21:57] Bitbucket: https://bitbucket.org/thefoldwithin/git-sigil
[2025-06-07 01:22:26] GitHub: https://github.com/mrhavens/git-sigil
[2025-06-07 01:22:40] Local:
[2025-06-07 01:22:56] Radicle: RID=rad:z3FEj7rF8gZw9eFksCuiN43qjzrex, Peer ID=z6Mkw5s3ppo26C7y7tGK5MD8n2GqTHS582PPpeX5Xqbu2Mpz
CLI: rad inspect rad:z3FEj7rF8gZw9eFksCuiN43qjzrex # View project details
CLI: git ls-tree -r --name-only HEAD # View file structure
[2025-06-07 01:23:12] Forgejo: https://remember.thefoldwithin.earth/mrhavens/git-sigil
[2025-06-07 01:23:33] GitLab: https://gitlab.com/mrhavens/git-sigil
[2025-06-07 01:24:00] Bitbucket: https://bitbucket.org/thefoldwithin/git-sigil
[2025-06-07 01:24:25] GitHub: https://github.com/mrhavens/git-sigil
[2025-06-07 01:24:39] Local:
[2025-06-07 01:24:55] Radicle: RID=rad:z3FEj7rF8gZw9eFksCuiN43qjzrex, Peer ID=z6Mkw5s3ppo26C7y7tGK5MD8n2GqTHS582PPpeX5Xqbu2Mpz
CLI: rad inspect rad:z3FEj7rF8gZw9eFksCuiN43qjzrex # View project details
CLI: git ls-tree -r --name-only HEAD # View file structure
[2025-06-07 01:25:09] Forgejo: https://remember.thefoldwithin.earth/mrhavens/git-sigil
[2025-06-07 01:25:30] GitLab: https://gitlab.com/mrhavens/git-sigil
[2025-06-07 01:26:07] Bitbucket: https://bitbucket.org/thefoldwithin/git-sigil
[2025-06-07 01:26:30] GitHub: https://github.com/mrhavens/git-sigil
>>>>>>> be7726405b6412ae5af5144f9e2cf4d13bd32aeb

View file

@ -1,134 +1 @@
## 🧭 FULL CLI-ONLY WORKFLOW (Ubuntu + Bitbucket)
---
### 🔹 Step 1 — Install prerequisites
```bash
# Install Git
sudo apt update
sudo apt install git -y
# Install cURL and OpenSSH if not already
sudo apt install curl openssh-client -y
```
---
### 🔹 Step 2 — Create a Bitbucket account
Go to: [https://bitbucket.org/account/signup](https://bitbucket.org/account/signup)
> Youll need to verify email, set username, and generate an **App Password** with at least:
>
> * `Repository` (read/write)
> * `SSH` (read/write)
---
### 🔹 Step 3 — Set your global Git identity
```bash
git config --global user.name "Your Name"
git config --global user.email "your_email@example.com"
```
---
### 🔹 Step 4 — Generate and register your SSH key
```bash
# Generate SSH key (if not already present)
ssh-keygen -t rsa -b 4096 -C "your_email@example.com" -f ~/.ssh/id_rsa -N ""
# Start SSH agent
eval "$(ssh-agent -s)"
# Add key to agent
ssh-add ~/.ssh/id_rsa
```
Then copy your public key:
```bash
cat ~/.ssh/id_rsa.pub
```
Paste it into:
🔐 **Bitbucket → Personal settings → SSH keys → Add key**
---
### 🔹 Step 5 — Create your local project
```bash
mkdir myproject
cd myproject
git init
echo "# My Bitbucket Project" > README.md
git add .
git commit -m "Initial commit"
```
---
### 🔹 Step 6 — Create a new Bitbucket repo (via browser)
Unfortunately, **Bitbucket does not have a CLI tool** for creating repositories.
➡️ Go to: [https://bitbucket.org/repo/create](https://bitbucket.org/repo/create)
Create a **public** or **private** repo named the same as your folder (e.g., `myproject`).
> Ensure it's an **empty repo** (dont initialize with README or .gitignore).
---
### 🔹 Step 7 — Link local repo to Bitbucket via SSH
```bash
# Use the SSH format:
git remote add origin git@bitbucket.org:your_username/myproject.git
# Verify connection
ssh -T git@bitbucket.org
```
---
### 🔹 Step 8 — Push to Bitbucket
```bash
# Set upstream branch
git push -u origin master # or main
```
---
### 🔹 Step 9 — Make further commits
```bash
# Edit files
nano something.txt
# Stage, commit, push
git add .
git commit -m "Updated something"
git push
```
---
### 🔹 Bonus — Clone a Bitbucket repo
```bash
# Clone using SSH
git clone git@bitbucket.org:your_username/your_repo.git
```
---
### 🔒 Tip — Use SSH for all Bitbucket CLI work
Bitbucket heavily rate-limits HTTPS for CLI usage without app passwords.
Always prefer `SSH` for full CLI-based workflows.
---
Bitbucket workflow test