Great Question, Answer and Comment at [Wayback/Archive] What is the difference between git pull and git fetch + git rebase? – Stack Overflow (thanks [Wayback/Archive] michael, [Wayback/Archive] gawkface and [Wayback/Archive] Daniel K.):
Archive for the ‘git’ Category
What is the difference between git pull and git fetch + git rebase? – Stack Overflow
Posted by jpluimers on 2026/02/04
Posted in Development, DVCS - Distributed Version Control, git, Software Development, Source Code Management | Leave a Comment »
python – Some gists on github have very many forks. How can I find the most recently active and/or heavily modified? – Stack Overflow
Posted by jpluimers on 2025/12/30
Interesting read: there is even an API for it (which you need to be logged on for in order not to get a rate limit): [Wayback/Archive] python – Some gists on github have very many forks. How can I find the most recently active and/or heavily modified? – Stack Overflow
Thanks [Wayback/Archive] Michael Goldshteyn, [Wayback/Archive] rob006, [Wayback/Archive] Chankey Pathak and [Wayback/Archive] ikwyl6 for solving this both for gists and regular github repositories:
Share this:
Posted in Development, DVCS - Distributed Version Control, gist, git, GitHub, Software Development, Source Code Management | Leave a Comment »
rcmcdonald91/pfSense-pkg-WireGuard: This is a port of the original WireGuard UI bits as implemented by Netgate in pfSense 2.5.0 to a package suitable for rapid iteration and more frequent updating on future releases of pfSense.
Posted by jpluimers on 2025/12/25
This is actually the WireGuard package you can install on pfSense CE 2.5.2 and higher: [Wayback/Archive] rcmcdonald91/pfSense-pkg-WireGuard: This is a port of the original WireGuard UI bits as implemented by Netgate in pfSense 2.5.0 to a package suitable for rapid iteration and more frequent updating on future releases of pfSense.
Note that the source code mentions a lot of web-technologies but that is because the majority of the code is the pfSense plugin. Underneath it pulls the actual build from [Wayback/Archive] git.zx2c4.com/wireguard-freebsd/snapshot which is almost exclusively C code.
Like WireGuardNT on Windows, it uses a high performance kernel mode driver.
Some more links on it:
Share this:
Posted in Conference Topics, Conferences, Development, DVCS - Distributed Version Control, Event, git, GitHub, Hardware, Network-and-equipment, pfSense, Power User, routers, Software Development, Source Code Management, Tailscale | Tagged: 11281, 73 | Leave a Comment »
version control – How can I see the changes in a Git commit? – Stack Overflow
Posted by jpluimers on 2025/12/16
[Wayback/Archive] version control – How can I see the changes in a Git commit? – Stack Overflow (thanks [Wayback/Archive] laktak, [Wayback/Archive] Nevik Rehnel, [Wayback/Archive] Juuso Ohtonen and [Wayback/Archive] User c z – Stack Overflow)
This looks like a valid question, but in reality it is not.
The thing is: in git, think of a commit not as a diff but as a snapshot*.
A diff is the difference between two commits.
Since most commits have just a single parent, so that’s why many people call a commit a diff. But that’s not true, especially not for merge commits that have at least two parents.
Anyway, the question, answer and comment from the link above already give some insight (note COMMIT everywhere below has to be replaced with the commit hash):
Share this:
Posted in Conference Topics, Conferences, Development, DVCS - Distributed Version Control, Event, git, Software Development, Source Code Management | Leave a Comment »
How could i get a permanent link for raw file? · community · Discussion #22537 · GitHub
Posted by jpluimers on 2025/12/04
I used [Wayback/Archive] How could i get a permanent link for raw file? · community · Discussion #22537 · GitHub to go
- from github.com/sk3pp3r/cheat-sheet-pdf/blob/master/pdf/vim-cheat-sheet.pdf
- to raw.githubusercontent.com/sk3pp3r/cheat-sheet-pdf/master/pdf/vim-cheat-sheet.pdf
- in future blog post ikwyl6 vim cheat sheet
The reason I needed it is that for quite a while now, GitHub has started to display PDF files as preview, and modified the download behaviour to get a blob: link instead of the actual raw file download location.
On the to do list:
- figure out the same for raw files in gists
- figure out the same for GitLab
- convert these into Bookmarklets (fiddle with the bold parts in the above URLs)
Thanks [Wayback/Archive] Lotaristo (Czeslaw Meyer) and [Wayback/Archive] byrneh (Hugh Byrne)
--jeroen
Share this:
Posted in Bookmarklet, Conference Topics, Conferences, Development, DVCS - Distributed Version Control, Event, gist, git, GitHub, GitLab, Hosting, JavaScript/ECMAScript, Power User, Scripting, Software Development, Source Code Management | Tagged: 22537 | Leave a Comment »
Buddy (software) – Wikipedia
Posted by jpluimers on 2025/12/03
Interesting: Buddy (software) – Wikipedia
Buddy (also known as Buddy.Works) is a web-based and self-hosted continuous integration and delivery software for Git developers that can be used to build, test and deploy web sites and applications with code from GitHub, Bitbucket and GitLab. It employs Docker containers with pre-installed languages and frameworks for builds, alongside DevOps, monitoring and notification actions.
On my list of things to try in case built-in GitGub and GitLab functionality does not suffice my needs any more.
I wonder how well it runs on ARM architecture.
–jeroen
Share this:
Posted in Cloud, Containers, Continuous Integration, Development, DevOps, Docker, DVCS - Distributed Version Control, git, GitHub, GitLab, Infrastructure, Power User, Software Development | Leave a Comment »
Merging Git repositories without losing history – The Continuous Improver
Posted by jpluimers on 2025/11/06
For my link archive: [Wayback/Archive] Merging Git repositories without losing history – The Continuous Improver
Via:
- [Wayback/Archive] Matthijs ter Woord on Twitter: “@ddoomen I’ve done it in the past without any external tooling or rewriting history of one of the original repo’s. but for the rest, clear guide.”
- [Wayback/Archive] Dennis Doomen | mastodon.social/@ddoomen on Twitter: “I’m sure it’s not something you would do often, but here’s a guide on how to merge two git repositories and still keep the entire history.”
–jeroen
Share this:
Posted in Conference Topics, Conferences, Development, DVCS - Distributed Version Control, Event, git, Software Development, Source Code Management | Leave a Comment »
xahteiwi.eu – Handy Git aliases
Posted by jpluimers on 2025/09/11
For my link archive: [Wayback/Archive] xahteiwi.eu – Handy Git aliases
- List branches by their date of last modification
- Delete old topic branches that have been merged
- Find the origin of a branch point
- Fix trailing whitespace
–jeroen
Share this:
Posted in Development, DVCS - Distributed Version Control, git, Software Development, Source Code Management | Leave a Comment »
Figuring out the version of a GitLab instance
Posted by jpluimers on 2025/08/05
The easiest way to figure out the version number of a GitLab instance is to browse to the /help bage.
But be aware the version number only shows when you are signed in.
At the time of writing [Wayback/Archive] Help · GitLab (gitlab.com/help) showed this:
GitLab Enterprise Edition 15.7.0-pre ff1158094d6
The link showed [Wayback/Archive] Commits · ff1158094d6 · GitLab.org / GitLab · GitLab.
When nog logged on, the help page showed this:
GitLab Enterprise Edition
Via [Wayback/Archive] Markdown rendering of double indented lists fails (#33471) · Issues · GitLab.org / GitLab FOSS · GitLab.
Confirmed by [Wayback/Archive] How to check the version of GitLab? – Stack Overflow (thanks [Wayback/Archive] Maxim).
–jeroen
Share this:
Posted in Development, DVCS - Distributed Version Control, git, GitLab, Software Development, Source Code Management | Leave a Comment »
Installing and authenticating the GitHub CLI gh and GitLab CLI glab on Windows
Posted by jpluimers on 2025/07/16
As a keyboard person, I prefer to live on the CLI (command-line interface), so when possible I prefer command-line tools over GUI tools (especially since command-line tool are way easier to script).
In the past on non-Windows systems I used gist (see below), but that is not available on Windows unless you have a Ruby environment.
Some notes on Windows to install and authenticate GitHub CLI (gh) and GitLab CLI (glab), both of which I previously mentioned in Tribal Knowledge? Getting the public keys from github and gitlab users from their username.
For me, installing is easiest through Chocolatey (version numbers from the time of writing; the non-archived URLs point to the most current version available):
- [Wayback/Archive] Chocolatey Software | GitHub CLI 2.20.2
- [Wayback/Wayback] Chocolatey Software | glab 1.22.0 which depends on this actual install:
This was my install script:
Share this:
Posted in Conference Topics, Conferences, Development, DVCS - Distributed Version Control, Event, git, GitHub, GitLab, Power User, Software Development, Source Code Management | Tagged: 233 | Leave a Comment »
The Wiert Corner - irregular stream of stuff 