🔀 Merge: resolved conflicts with github master
This commit is contained in:
Mark Randall Havens
commit
38bfa138c3
4 changed files with 67 additions and 0 deletions
|
|
@ -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`
|
||||
>>>>>>> 4b323cbd7da16625ba04d2a7e8db3532f84bc1e0
|
||||
|
||||
---
|
||||
|
||||
## 📦 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 <mark.r.havens@gmail.com>`
|
||||
- **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)
|
||||
>>>>>>> 4b323cbd7da16625ba04d2a7e8db3532f84bc1e0
|
||||
|
||||
---
|
||||
|
||||
## 📊 Repo Status
|
||||
|
||||
<<<<<<< HEAD
|
||||
- **Total Commits**: `784`
|
||||
- **Tracked Files**: `113`
|
||||
- **Uncommitted Changes**: `Yes`
|
||||
=======
|
||||
- **Total Commits**: `756`
|
||||
- **Tracked Files**: `81`
|
||||
- **Uncommitted Changes**: `No`
|
||||
>>>>>>> 4b323cbd7da16625ba04d2a7e8db3532f84bc1e0
|
||||
- **Latest Tag**: `None`
|
||||
|
||||
---
|
||||
|
|
|
|||
|
|
@ -6,26 +6,45 @@
|
|||
- **Local Repo Path**: `/mnt/c/Downloads/git-sigil`
|
||||
- **Remote Label**: `github`
|
||||
- **Default Branch**: `master`
|
||||
<<<<<<< HEAD
|
||||
- **This Commit Date**: `2025-06-07 00:20:54`
|
||||
=======
|
||||
- **This Commit Date**: `2025-06-06 12:26:22`
|
||||
>>>>>>> 4b323cbd7da16625ba04d2a7e8db3532f84bc1e0
|
||||
|
||||
---
|
||||
|
||||
## 📦 Commit Info
|
||||
|
||||
<<<<<<< HEAD
|
||||
- **This Commit Timestamp**: `2025-06-07 00:20:54`
|
||||
- **Last Commit SHA**: `231eee68616d3394d349c3cc982608617297caaa`
|
||||
- **Last Commit Message**: `Local metadata link commit at 2025-06-07 00:18:57 — file:///home/mrhavens/git-local-repos/git-sigil.git`
|
||||
- **Last Commit Author**: `Mark Randall Havens <mark.r.havens@gmail.com>`
|
||||
- **Last Commit Date**: `Sat Jun 7 00:19:01 2025 -0500`
|
||||
- **This Commit URL**: [https://github.com/mrhavens/git-sigil/commit/231eee68616d3394d349c3cc982608617297caaa](https://github.com/mrhavens/git-sigil/commit/231eee68616d3394d349c3cc982608617297caaa)
|
||||
=======
|
||||
- **This Commit Timestamp**: `2025-06-06 12:26:22`
|
||||
- **Last Commit SHA**: `b2584503af8db546a9deb5444b93b0932957f56f`
|
||||
- **Last Commit Message**: `Post-Bitbucket 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:26:12 2025 -0500`
|
||||
- **This Commit URL**: [https://github.com/mrhavens/git-sigil/commit/b2584503af8db546a9deb5444b93b0932957f56f](https://github.com/mrhavens/git-sigil/commit/b2584503af8db546a9deb5444b93b0932957f56f)
|
||||
>>>>>>> 4b323cbd7da16625ba04d2a7e8db3532f84bc1e0
|
||||
|
||||
---
|
||||
|
||||
## 📊 Repo Status
|
||||
|
||||
<<<<<<< HEAD
|
||||
- **Total Commits**: `789`
|
||||
- **Tracked Files**: `113`
|
||||
- **Uncommitted Changes**: `Yes`
|
||||
=======
|
||||
- **Total Commits**: `758`
|
||||
- **Tracked Files**: `81`
|
||||
- **Uncommitted Changes**: `No`
|
||||
>>>>>>> 4b323cbd7da16625ba04d2a7e8db3532f84bc1e0
|
||||
- **Latest Tag**: `None`
|
||||
|
||||
---
|
||||
|
|
@ -48,7 +67,11 @@
|
|||
- **Running in Docker**: `No`
|
||||
- **Running in WSL**: `Yes`
|
||||
- **Virtual Machine**: `wsl`
|
||||
<<<<<<< HEAD
|
||||
- **System Uptime**: `up 22 hours, 28 minutes`
|
||||
=======
|
||||
- **System Uptime**: `up 11 hours, 10 minutes`
|
||||
>>>>>>> 4b323cbd7da16625ba04d2a7e8db3532f84bc1e0
|
||||
- **MAC Address**: `00:15:5d:86:d8:cc`
|
||||
- **Local IP**: `172.18.207.124`
|
||||
- **CPU Model**: `AMD A6-3420M APU with Radeon(tm) HD Graphics`
|
||||
|
|
|
|||
|
|
@ -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`
|
||||
>>>>>>> 4b323cbd7da16625ba04d2a7e8db3532f84bc1e0
|
||||
|
||||
---
|
||||
|
||||
## 📦 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 <mark.r.havens@gmail.com>`
|
||||
- **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)
|
||||
>>>>>>> 4b323cbd7da16625ba04d2a7e8db3532f84bc1e0
|
||||
|
||||
---
|
||||
|
||||
## 📊 Repo Status
|
||||
|
||||
<<<<<<< HEAD
|
||||
- **Total Commits**: `782`
|
||||
- **Tracked Files**: `113`
|
||||
- **Uncommitted Changes**: `Yes`
|
||||
=======
|
||||
- **Total Commits**: `754`
|
||||
- **Tracked Files**: `81`
|
||||
- **Uncommitted Changes**: `No`
|
||||
>>>>>>> 4b323cbd7da16625ba04d2a7e8db3532f84bc1e0
|
||||
- **Latest Tag**: `None`
|
||||
|
||||
---
|
||||
|
|
|
|||
|
|
@ -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,8 @@
|
|||
[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
|
||||
[2025-06-06 12:26:12] Bitbucket: https://bitbucket.org/thefoldwithin/git-sigil
|
||||
>>>>>>> 4b323cbd7da16625ba04d2a7e8db3532f84bc1e0
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue