diff --git a/.gitfield/bitbucket.sigil.md b/.gitfield/bitbucket.sigil.md index 693e889..43b1cbb 100644 --- a/.gitfield/bitbucket.sigil.md +++ b/.gitfield/bitbucket.sigil.md @@ -6,26 +6,45 @@ - **Local Repo Path**: `/mnt/c/Downloads/git-sigil` - **Remote Label**: `bitbucket` - **Default Branch**: `master` +<<<<<<< HEAD - **This Commit Date**: `2025-06-07 00:15:13` +======= +- **This Commit Date**: `2025-06-06 12:26:06` +>>>>>>> be7726405b6412ae5af5144f9e2cf4d13bd32aeb --- ## πŸ“¦ Commit Info +<<<<<<< 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 ` - **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 ` +- **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 +<<<<<<< HEAD - **Total Commits**: `784` - **Tracked Files**: `113` - **Uncommitted Changes**: `Yes` +======= +- **Total Commits**: `756` +- **Tracked Files**: `81` +- **Uncommitted Changes**: `No` +>>>>>>> be7726405b6412ae5af5144f9e2cf4d13bd32aeb - **Latest Tag**: `None` --- diff --git a/.gitfield/gitlab.sigil.md b/.gitfield/gitlab.sigil.md index 5662d31..66a99ac 100644 --- a/.gitfield/gitlab.sigil.md +++ b/.gitfield/gitlab.sigil.md @@ -6,26 +6,45 @@ - **Local Repo Path**: `/mnt/c/Downloads/git-sigil` - **Remote Label**: `gitlab` - **Default Branch**: `master` +<<<<<<< HEAD - **Repo Created**: `2025-06-07 00:14:50` +======= +- **Repo Created**: `2025-06-06 12:25:52` +>>>>>>> be7726405b6412ae5af5144f9e2cf4d13bd32aeb --- ## πŸ“¦ Commit Info +<<<<<<< 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 ` - **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 ` +- **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 +<<<<<<< HEAD - **Total Commits**: `782` - **Tracked Files**: `113` - **Uncommitted Changes**: `Yes` +======= +- **Total Commits**: `754` +- **Tracked Files**: `81` +- **Uncommitted Changes**: `No` +>>>>>>> be7726405b6412ae5af5144f9e2cf4d13bd32aeb - **Latest Tag**: `None` --- diff --git a/.gitfield/pushed.log b/.gitfield/pushed.log index 11cdf9c..6463365 100644 --- a/.gitfield/pushed.log +++ b/.gitfield/pushed.log @@ -111,6 +111,7 @@ [2025-06-06 12:25:38] 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 +<<<<<<< HEAD [2025-06-07 00:07:30] Local: [2025-06-07 00:07:39] Radicle: RID=rad:z3FEj7rF8gZw9eFksCuiN43qjzrex, Peer ID=z6Mkw5s3ppo26C7y7tGK5MD8n2GqTHS582PPpeX5Xqbu2Mpz CLI: rad inspect rad:z3FEj7rF8gZw9eFksCuiN43qjzrex # View project details @@ -135,3 +136,7 @@ [2025-06-07 00:14:56] GitLab: https://gitlab.com/mrhavens/git-sigil [2025-06-07 00:15:19] Bitbucket: https://bitbucket.org/thefoldwithin/git-sigil [2025-06-07 00:15:41] GitHub: https://github.com/mrhavens/git-sigil +======= +[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 +>>>>>>> be7726405b6412ae5af5144f9e2cf4d13bd32aeb diff --git a/docs/bitbucket/CLI-ONLY_workflow_bitbucket_ubuntu.md b/docs/bitbucket/CLI-ONLY_workflow_bitbucket_ubuntu.md index f15aad7..aa60818 100644 --- a/docs/bitbucket/CLI-ONLY_workflow_bitbucket_ubuntu.md +++ b/docs/bitbucket/CLI-ONLY_workflow_bitbucket_ubuntu.md @@ -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) - -> You’ll 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** (don’t 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