Posted by jpluimers on 2021/03/10
Next time I need to apply a patch file directly from git itself, I need to re-read [WayBack] Applying .patch File From Git – Easyread – Medium.
Without git, just run the patch command as per [WayBack] What is a patch in git version control? – Stack Overflow
The git workflow for the above git scenario is this one:
–jeroen
Posted in Development, DVCS - Distributed Version Control, git, Software Development, Source Code Management | Leave a Comment »
Posted by jpluimers on 2021/02/18
is a documentation browser that finds the relevant docs for your code. It works by parsing the code and connecting parts of it to their explanation in the docs
, and supports these languages:
You can enter any language text, then click the language, followed by clicking the “SHOW ME THE DOCS!” button, for which an example is further below.
The site has an open architecture, allowing to plug in more languages and documentation:
So for instance the below ./git/config file leads to this result [WayBack] where you can click on all the coloured areas for easy navigation through the documentation:
Posted in *nix, *nix-tools, Database Development, Development, DVCS - Distributed Version Control, git, MySQL, nginx, PostgreSQL, Power User, Software Development | Leave a Comment »
Posted by jpluimers on 2021/02/03
Sometimes I forget the choco install mnemonics for various tools, so here is a small list below.
Of course you have to start with an administrative command prompt, and have a basic Chocolatey Installation in place.
If you want to clean cruft:
choco install --yes choco-cleaner
Basic install:
choco install --yes 7zip choco install --yes everything choco install --yes notepadplusplus choco install --yes beyondcompare choco install --yes git.install --params "/GitAndUnixToolsOnPath /NoGitLfs /SChannel /NoAutoCrlf /WindowsTerminal" choco install --yes hg choco install --yes sourcetree choco install --yes sysinternals
For VMs (pic one):
choco install --yes vmware-tools choco install --yes virtio-drivers
For browsing (not sure yet about Chrome as that one has a non-admin installer as well):
choco install --yes firefox
For file transfer (though be aware that some versions of Filezilla contained adware):
choco install --yes filezilla choco install --yes winscp
For coding:
choco install --yes vscode choco install --yes atom
For SQL server:
choco install --yes sql-server-management-studio
For web development / power user:
choco install --yes fiddler
For SOAP and REST:
choco install --yes soapui
If you don’t like manually downloading SequoiaView at gist.github.com/jpluimers/b0df9c2dba49010454ca6df406bc5f3d (e8efd031d667de8a1808d6ea73548d77949e7864.zip):
choco install --yes windirstat
For drawing, image manipulation (paint.net last, as it needs a UI action):
choco install --yes gimp choco install --yes imagemagick choco install --yes paint.net
For ISO image mounting in pre Windows 10:
choco install --yes wincdemu
For hard disk management:
choco install --yes hdtune choco install --yes seatools choco install --yes speedfan
For Fujitsu ScanSnap scanners (not sure yet this includes PDF support):
choco install --yes scansnapmanager
–jeroen
Posted in 7zip, atom editor, Beyond Compare, Chocolatey, Compression, Database Development, Development, DVCS - Distributed Version Control, Everything by VoidTools, Fiddler, Firefox, Fujitsu ScanSnap, git, Hardware, Mercurial/Hg, Power User, Scanners, SOAP/WebServices, Software Development, Source Code Management, SQL Server, SSMS SQL Server Management Studio, SysInternals, Text Editors, Versioning, Virtualization, VMware, VMware ESXi, vscode Visual Studio Code, Web Browsers, Web Development, Windows | Leave a Comment »
Posted by jpluimers on 2020/12/31
[WayBack] Syncing your fork to the original repository via the browser · KirstieJane/STEMMRoleModels Wiki · GitHub
TL;DR: you can do the sync from the Web UI, but it always gives you an extra merge commit.
–jeroen
Posted in Development, DVCS - Distributed Version Control, git, GitHub, LifeHacker, Power User, Source Code Management | Leave a Comment »
Posted by jpluimers on 2020/12/23
Spending most of your career as an independent contractor, you bump into a lot of toolchains.
Part of those toolchains usually involved (and by now surely should involve) version control for both development and infrastructure configuration management.
I remember PlasticSCM quite well.
The really good part is the branch overview (called Branch Explorer) in the PlasticSCM UI, as it is:
They also have frequent updates, which however are hard to discover because there is no built-in update mechanism that notifies you of them.
Those updates are badly needed, because I kept bumping into bugs. Which is odd, because I bumped into far less issues when using UI layers for SVN, TFS, Mercurial and git (SourceTree being a major exception, but they seem to have recovered from a long period of bad versions a few years back).
So here are some of my gripes, that might have been fixed by now.
Posted in Delphi, Development, PlasticSCM, Software Development, Source Code Management, Versioning | Leave a Comment »
Posted by jpluimers on 2020/12/16
Learned TWO things at once Mark Longair and VonC at [WayBack] git – Hard reset of a single file – Stack Overflow :
You can use the following command:
git checkout HEAD -- my-file.txt… which will update both the working copy of
my-file.txtand its state in the index with that from HEAD.
--basically means: treat every argument after this point as a file name. More details in this answer. Thanks to VonC for pointing this out.
Related:
Posted in Development, DVCS - Distributed Version Control, git, Software Development, Source Code Management | Leave a Comment »
Posted by jpluimers on 2020/12/01
I stick to git log --name-status as suggested in [WayBack] How to have git log show filenames like svn log -v – Stack Overflow.
A slightly less readable alternative isgit log --num-status .
There is also git log --name-only as suggested in [WayBack] How to show changed file name only with git log? – Stack Overflow
–jeroen
Posted in Development, DVCS - Distributed Version Control, git, Software Development, Source Code Management | Leave a Comment »
Posted by jpluimers on 2020/11/26
For my archive: [WayBack] Git Mergetool and difftool with Beyond Compare 4 · GitHub
I stuck to this as I:
- do not run
git bash- have Beyond Compared installed in the default directory (not the
x86one)- do not want a new UI instance, so use the recommended
BComp.exegit config --global merge.tool bc4 git config --global mergetool.bc4.cmd "'C:/Program Files/Beyond Compare 4/BComp.exe' \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"" git config --global mergetool.bc4.trustExitCode trueThis works splendid with
git mergetool: it starts a merge in the already openBCompare.exeinstance.I only do merge from Beyond Compare, so no need for me to do a similar Beyond Compare setup for
diff.tool, but if anyone wants it, it would be this:git config --global diff.tool bc4 git config --global difftool.bc4.cmd "'C:/Program Files/Beyond Compare 4/BComp.exe' \"$LOCAL\" \"$REMOTE\"" git config --global difftool.bc4.prompt false
This works fine for any git versoin > 2.2.0.
Related:
What I need to find out is if it is possible to open all merges at once in Beyond Compare. Maybe these help:
This did help getting rid of .orig files: [WayBack] version control – Git mergetool generates unwanted .orig files – Stack Overflow
–jeroen
Posted in Development, DVCS - Distributed Version Control, git, Software Development, Source Code Management | Leave a Comment »
Posted by jpluimers on 2020/11/25
Since I keep forgetting how simple it is: [WayBack] git – I ran into a merge conflict. How can I abort the merge? – Stack Overflow
If your git version is >= 1.6.1, you can use
git reset --merge.Also, as @Michael Johnson mentions, if your git version is >= 1.7.4, you can also use
git merge --abort.As always, make sure you have no uncommitted changes before you start a merge.
From the git merge man page:
git merge --abortis equivalent togit reset --mergewhenMERGE_HEADis present.
MERGE_HEADis present when a merge is in progress.Also, regarding uncommitted changes when starting a merge:
If you have changes you don’t want to commit before starting a merge, just
git stashthem before the merge andgit stash popafter finishing the merge or aborting it.
–jeroen
Posted in Development, DVCS - Distributed Version Control, git, Software Development, Source Code Management | Leave a Comment »
Posted by jpluimers on 2020/11/18
Checkout github pull requests locally. GitHub Gist: instantly share code, notes, and snippets.
Source: [WayBack] Checkout github pull requests locally · GitHub
The trick is to add one more fetch line to the [remote "origin"] sections in your .git/config files, as in the gist below.
fetch = +refs/pull/*/head:refs/remotes/origin/pr/*
Which reminds me I should read more about that the fetch syntax which is called RefSpec: [WayBack] Git – The Refspec
–jeroen
Posted in Development, DVCS - Distributed Version Control, git, GitHub, Software Development, Source Code Management | Leave a Comment »
The Wiert Corner - irregular stream of stuff 
jpluimers commented