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 »
Posted by jpluimers on 2020/11/10
I didn’t know there were multiple ways to push to multiple remotes.
[WayBack] github – Git – Pushing code to two remotes – Stack Overflow is intriguing as the accept answer shows one remote can have more than one URL, and you can push to all of them at the same time.
Most people just have multiple remotes with one URL per remote, and have a branch optionally track one remote brach: [WayBack] How can I tell a local branch to track a remote branch?
The other way around: you can find out which branch track remote branches as well: [WayBack] git – Find out which remote branch a local branch is tracking – 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/04
Out of the box, Visual Studio Code does allow you to pull from and commit/push to git repositories, but it has not much more git support.
These two marketplace extensions will help big time:
I like GitLens most as it covers so much more than just git history.
If you only need git history access, then you can use Git History as well.
More information and a better comparison:
–jeroen
Posted in Development, DVCS - Distributed Version Control, git, Software Development, Source Code Management | Leave a Comment »
Posted by jpluimers on 2020/11/03
Too bad I bumped into this a long time after having been a regular PlasticSCM user: [Archive.is] Plastic SCM blog: Unified diff of a branch:
Learn how to create a custom action to run a unified diff operation for a Plastic SCM branch.
It is an open source tool called unifiedbranchdiff.exe at github, and seems based on a cm path for getting paths, and cm patch for generating the actual patch, and needing external GNU tools diff and patch (hopefully it also works with more recent versions than the woefully outdated 2007 Win32 versions of [WayBack] DiffUtils 2.8.7 for Windows and [WayBack] Patch 2.5.9 for Windows).
Related:
–jeroen
Posted in Development, DVCS - Distributed Version Control, PlasticSCM, Software Development, Source Code Management | Leave a Comment »
Posted by jpluimers on 2020/10/31
A very interesting thread by @doctorow:
Late last week, the @RIAA sent a legal threat to @Github, claiming that the popular (and absolutely lawful) tool #youtubedl (which allows users to download Youtube videos for offline viewing, e……
Source: [WayBack] Thread by @doctorow on Thread Reader App – Thread Reader App
More on section 1201: [Wayback] Pluralistic: 24 Oct 2020 – Pluralistic: Daily links from Cory Doctorow: RIAA kills youtubedl
There is also a great technical analysis at [Wayback/Archive.is] Analysis of the RIAA claims against youtube-dl · GitHub
This write-up follows the code paths in youtube-dl that get executed when you try to run it based on the claims of RIAA has put forward. This is a technical analysis, not a legal one.
via
–jeroen
Posted in Development, DVCS - Distributed Version Control, GitHub, Opinions, Power User, Software Development, Source Code Management | Leave a Comment »
Posted by jpluimers on 2020/10/29
I used these links to find out what entries a Katalon .gitignore file should contain:
Combining the above, the .gitignore file needs to at least contain:
/.classpath /.project /.settings bin/lib/ Libs/ /bin /Libs .settings .classpath settings/internal /.svn /bin/lib/Temp*.class Reports/ .project /libs/Temp*.groovy bin/lib/ bin/keyword/
(funny that .svn should be in a .gitignore file and that various combinations of casing are used)
–jeroen
Posted in Development, DVCS - Distributed Version Control, git, Katalon, Software Development, Source Code Management, Testing | Leave a Comment »
The Wiert Corner - irregular stream of stuff 
jpluimers commented