Cherry pick files from a commit in a repository
In git there is the commandgit cherry-pick that allows to “apply the changes introduced by some existing commits”.This is nice if you want to reorder entire commits or things like that.
I often have the use case that I want to see individual files side-by-side to compare them or overwrite files with a previous version, your might have more precise use cases in mind.At the beginning I thoughtgit cherry-pick is the command I was looking for but I sound found out, it is not. So I went back, often to the GitHub web interface and just browsed the history and then the file tree to view the file at a certain state.
But sincegit has a very nice object storage I found out, that I can get any object withgit show ${object_id} resp.git show --format=raw ${object_id}. An object can be a commit, a tree (directory), or a blob (file). So I needed to get the object id of the blob that I want to see. This can be done withgit ls-tree command resp. to just get the specific id of the file I’m looking for:git ls-tree --object-only -r ${commit} ${file}.
All to gather I have put this into these lines, which you can find athttps://github.com/white-gecko/git-cherry-file:
#!/bin/sh## Done by Natanael 2023-01-31# see also: https://stackoverflow.com/a/42623347/414075commit=$1file=$2target_file=${3:-${file}.cherry}echo"Pick${file} from commit${commit}"file_id=$( git ls-tree--object-only-r${commit}${file})echo"It has the object id${file_id}"git show--format=raw${file_id}>${target_file}echo"Written to${target_file}"Just make it executable and put it into your path, e.g.~/.local/bin/git-cherry-file and call it with:
$git-cherry-file HEAD~2 README.mdIt will create a new fileREADME.md.cherry. If you want to specify the target path you can add it as an additional argument, e.g. to overwrite the current file:
$git-cherry-file HEAD~2 README.md README.mdI hope you like it.
(read on …)Animate the History of your Git Repository
I was looking for a way to get an impression of the temporal development of my git repository.So I chose to check for ways to animate the history of a git repository.
I found some DIY approach that should provide very nice results, but it requires some more effort.Basically you iterate through all of your commits, execute a command to visualize this commit, what ever that means to you, and then merge all of these visualizations as frames together as a movie file.The exect steps are here:http://eptcomic.com/ept1movie.htm.
Another tool is Gource (https://gource.io/).It renders your repository in a 3D animation, that looks quite fancy.A good startingpoint is:
$ apt install gource$ gource -c 4.0 -s 1 -a 1 .The major difference between the two tools and their results is, that with the first on you can visualize the content of the repository as it evolves, while the Gource mainly visualizes the file structure and the collaboration process on it.
(This post was originally started on 2020-10-18)
(read on …)Backup done right … and what about config?
From time to time it is important to create a backup of your data.There are some tools that help one to copy files in some sophisticated ways onto a different medium.I choserestic for this job.
But this only works well for the data you are working on, we call ituser data, but not for your configuration.Some backup articles suggest to just backup the complete users home directory which stores theuser configuration, but this will not include thesystem configuration.On top of this for me a backup is not a raw copy of the current system I’m working on, but just the actually relevant data and configuration.This can also come along with an additional use case for a backup, that I want to use it to setup a clean new system where I only want to take over the data that I actually need.
So far I have not found any system, that covers the aspects mentioned, which leads me to the point that I’ve started to write down a concept for aconfiguration backup system.You are welcome to send any hints and suggestions.
(read on …)Dissertation: “Distributed Collaboration on Versioned Decentralized RDF Knowledge Bases”
If you are looking for a good read for the holiday season or even a geeky present check this out. My dissertation “Distributed Collaboration on Versioned Decentralized RDF Knowledge Bases” is now published at theOpen Access University Press Leipzig (Open-Access-Hochschulverlag Leipzig) which is situated at the LeipzigUniversity of Applied Sciences (HTWK Leipzig). It is available online as Open Access (DOI10.33968/9783966270205-00) and at your favorite book shop (isbn: 978-3-96627-019-9).
(read on …)If you are doing #SoftwareDevelopment resp. #SoftwareEngineering an looking for a #LaTeX/#TikZ version of a simple agile development #cycle check out my page ;-)https://natanael.arndt.xyz/notes/agile #SCRUM #agile
If you want to read my papers but you are to lazy to download them and open them with your favorite PDF reader you now get the service to read them all directly on my web page. Some as #HTML some as embedded #PDF. https://natanael.arndt.xyz/publications #OpenResearch #OpenAccess
If you are working on #SemanticWeb an looking for a #LaTeX/#TikZ version of the #LayerCake and the #LODCycle check out my page ;-)https://natanael.arndt.xyz/notes/semantic-web-layer-cake andhttps://natanael.arndt.xyz/notes/lod-cycle #LOD
Just released #JekyllRDF 3.1.0! The cool new feature is that you can now build pages from a #SPARQL endpoint. Checkout the CHANGELOG and README for details. We hope you like it.https://rubygems.org/gems/jekyll-rdfhttps://github.com/white-gecko/jekyll-rdf @akswgroup (https://mobile.twitter.com/white_gecko/status/1067452594954661889)
Now you can find my paper “A Method for Distributed and Collaborative Curation of RDF Datasets Utilizing the Quit Stack”10.18420/in2017_187 with the full text published as HTML and #OpenAccess #OpenResearch on my #JekyllRDF bloghttps://natanael.arndt.xyz/bib/arndt-n-2017–quitstack
My Bibliography with Jekyll RDF
From now on the list ofmy publications is rendered using Jekyll-RDF. I’ve used thebibtex2rdf script together with acustomized mapping to convert mybibtex file toRDF.This file is consumed byJekyllRDF and rendered together with the rest of my blog using thepublications template for the lost of all publications and anadditional template to render a page for each individual publication resource.
(read on …)Jekyll RDF Tutorial Screencast
Today I’ve released my #jekyllrdf Tutorial Screencast on Vimeo.It teaches you all the basics necessary to create a simple Jekyll page from an RDF knowledgebase.I hope that you enjoy it and that it is helpful for you!
(read on …)Generate a QR Code to Recover Your OTP Secret
Bitcoin.de as some other pages is using a One-Time-Pad (OTP) as two-factor authentication method, actually it is aTime-based One-Time Password algorithm (TOTP).The Passwords are generated based on ashared secret as specified inRFC6238.When activating the two-factor authentication on bitcoin.de the page shows a QR code which is used by OTP apps, such asandOTP (github),Google Authenticator, orOTP Authenticator (github), to transfer theshared secret to the phone. Additionally the page shows theshared secret as a string of letters and numbers, which one should write down and deposit in a safe place.
But what happens, if due to some circumstances you have to bring thisshared secret back into the app?
(read on …)Ein neues Rezept ist online:Kartoffelsalat mit Räuchertofu.
Now I’m able to write status posts from my mobile using #FastHub-Libre :nerd:
Today we’ve released #jekyllrdf 2.3.0 at #rubygemshttps://rubygems.org/gems/jekyll-rdf, read more:https://natanael.arndt.xyz/2017/10/23/jekyll-rdf-2.3.0 #ruby #jekyllrb
JekyllRDF 2.3.0
Today we’ve released #jekyllrdf 2.3.0 at rubygemshttps://rubygems.org/gems/jekyll-rdf.Thedocumentation &changelog can be found as always at GitHub:https://github.com/white-gecko/jekyll-rdf/.We are very happy about allcontributors, from the past and the presence, but would also like to welcome you as a future contributor ;-)As of today this should be the last version of the 2.x branch, since we are already working hard on the next major release 3.0.0.If you are interested in what is coming next, have a look at the3.0.0-milestone.
(read on …)#DigitalisierungFirstBedenkenSecond
Als ich den BeitragZDF „volle kanne“: „Heimliche Videoüberwachung im Supermarkt“ Beitrag vom 21.09.2017 gesehen habe war eine meiner ersten Assoziationen das Wahlkampf-Motto der FDP im Bundestagswahlkampf: „Digitalisierung first Bedenken second“.Ich denk, dass vor der Installation oder Akzeptanz von dem was digital Möglich ist durchaus Bedenken hinsichtlich der gesellschaftlichen Auswirkungen angebracht sind:Müssen wir es tatsächlich in Kauf nehmen ungefragt dazu beizutragen unsere Freiheit einzuschränken?Wenn der Kunde zwar nicht im Einzelnen aber als Gesamtheit auf diese Art und Weise gläsern wird, wird ihm sein Stimme in der liberalen Marktwirtschaft genommen?
(read on …).@SoerenAuer from @TIBHannover is showing some old computing stuff, recipies, functions, and chinese pots at his keynote at #informatik2017
Richard Stallman is speaking at theGI INFORMATIK 2017. In his talk he is using “Person” and the pronouns “per”, and “per’s” which work like “her” and “her’s” but for any gender.This post was purely created with free software (vim, git, jekyll) and is licensed underCC BY-ND.
Von Christen und Muslimenhttps://correctiv.org/echtjetzt/artikel/2017/09/12/muslime-christen-leipzig/ via @correctiv_org Ob Christen oder Muslime? Auch das ist nicht entscheidend …
Bilanz vom heutigen Arbeitsweg @stadtradeln durch #Leipzig: 2× zugeparkter Radweg, 1× aufdringliches Auto in Fahrbahnverengung #BlankeNerven
.@Poliauwei was macht man denn mit falsch geparkten Schildern auf dem #Fahrradweg auf der Prager Straße in @StadtLeipzig?
:-D #typo it should be #jekyllrdfRT:https://twitter.com/white_gecko/status/887961476970971136
Yesterday we’ve released #jekyllrdf 2.1.0 at #rubygemshttps://rubygems.org/gems/jekyll-rdf, #docu & #changelog:https://github.com/white-gecko/jekyll-rdf/ #ruby #jekyllrb
From now on my blog also has apage for File Not Found Errors (aka. Error 404)
RT: Das sollte in jeder Kirche hängen!https://twitter.com/citykirche_sw/status/885769776718635009
From now on pre-releases of #jeykllrdf are automatically deployed to #rubygemshttps://rubygems.org/gems/jekyll-rdf #ruby #jekyllrb (Waiting for 2.1.0 …)
On my way through the Web today I realized the#NetNeutrality campaign. This is important!https://natanael.arndt.xyz/2017/07/12/Netzneutralität
Netzneutralität
Gerade auf meinem Weg durch das Netz bin ich beiStackOverflow vorbeigeschlendert.Eigentlich war ichdienstlich unterwegs, dabei wurde ich durch einen schwarzen Balken ganz oben auf der Seite abgelenkt.
I could reduce the image size of DockerJekyllPages (DJP) 0.3.2 by 11.5% compared to the last release which already saved 12% #docker #jekyll
I was tired of checking #docker inspect for a containers local IPhttps://hub.docker.com/r/mgood/resolvable/ makescontainer.docker available straight away
RT: Gemeinsame Erklärung von Kardinal Marx und @landesbischof Bedford-Strohm zu #G20HH2017: https://www.ekd.de/ekd_de/ds_doc/170704_pm_108_Anlage_Erklaerung_zum_bevorstehenden_G20-Gipfel.pdf … #G20
“Peter Schaar: Der Staat ist ein feiger Leviathan” @heise zum Thema #staatstrojaner durch die Hintertürhttp://www.heise.de/newsticker/meldung/Peter-Schaar-Der-Staat-ist-ein-feiger-Leviathan-3755246.html
Today I’ve released version 0.3.0 of the DockerJekyllPages (DJP) image with support for private #git repos #docker #jekyll #githubpages
Forward SSH-Authentication to a Docker Container
For my work on thedockerjekyllpages image (docker hub,GitHub) I came across the issue that I also want to be able to build from private git repositories and thus want to authenticate using a private SSH key.During my research on this topic I came acrossthis stackoverflow post by Aistis which proposes forwarding the SSH authentication socket (orauthorization, not sure about that) which allows the container to communicate with your hosts SSH authentication method.I think this is a very clean solution and thus I’ve implemented it as follows.
(read on …)Some updates on the style regarding the status posts
Staatstrojaner kommt durch die Hintertür ohne eine Debatte zuzulassen, wollen wir das?http://www.sueddeutsche.de/digital/staatstrojaner-bundestag-will-weitreichendes-ueberwachungsgesetz-beschliessen-1.3554426 via @SZ
What is the best way to load private SSH keys into a #docker container for cloning e.g. private #git repositories?
I’ve just released my first version (0.2.0) of the DockerJekyllPages (DJP) imagehttps://natanael.arndt.xyz/2017/06/21/DockerJekyllPages0.2.0 … #docker #jekyll #githubpages
Now I could even fix the timezone issue by addingtimezone: Europe/Berlin to_config.yml :-)
Docker Jekyll Pages Release 0.2.0
Since I’ve forked thedockerjekyllpages fromDonMcNamara/dockerfiles just over a year ago to run my blog I’ve done some changes – improvements in my eyes.To make them usable for others I frequently built the image on thedocker hub and now even tagged release0.2.0 onGitHub as well as on thedocker hub.
(read on …)There is still some issue with the timezone …
From now on I can publish simple status messages as you know it from #twitter #pumpio or #gnusocial. Just not linked so far.
Sicherheitstest für meine Seite
D+
Bei meiner heutigen Presseschau bin ich auf die beidengolem undheise/ix Artikel zu einem neuen Sicherheitstest von Mozilla für Webseites gestoßen.Den Test erläutert die Entwicklerin April King ebenfalls ineinem Eintrag in ihrem eigenen Blog.Über die Seitehttps://observatory.mozilla.org/ kann man mit wenig Aufwand die eigene Seite überprüfen.
(read on …)Schwarz Weiß Fotos mit Gimp
Heute habe ich mal wieder einbiometrisches Passbild gebraucht.Dabei sind die Farben allerdings nicht besonders gut gelungen und ich finde eh Schwarz/Weiß-Bilder auf Pässen hübscher.Auf Grund dessen habe ich kurz nach Anleitungen zur Konvertierung von Farbbildern in Schwarz/Weiß-Bilder mit GIMP gesucht.Die simpelste Möglichkeit ist über das Menü „Bild“ > „Modus“ > „Graustufen“ das Bild in Graustufen umzuwandeln, das Ergebnis sieht aber nicht immer zufriedenstellend aus.Darüber hinaus gibt es verschiedene Möglichkeiten den Eindruck der Kontraste in Schwarz Weiß zu verstärken.Einen einfachen Überblick über die Möglichkeiten bietet das Tutorial „Converting Color Images to B&W“ und hat mir schnell zur Referenz geholfen.Das Tutorial „Digital B&W Conversion“ erklärt die einzelnen Effekte die bei der Konvertierung auftreten noch etwas genauer und ermöglichen ein tieferes Verständnis.
Eine weitere interessante Sache ist die „B/W Film Simulation“ GIMP Script-Fu Erweiterung von Serge Mankovski. Ein Danke gilt an der Stelle Pierre Vlček, welche in seinem Blogbeitrag „Digitale Schwarzweißfotografie mit GIMP“ die Erweiterung wieder ausgegraben hat.EineAnleitung zu Installation von GIMP Script-Fu Erweiterungen gibt es in der GIMP Dokumentation.
(read on …)Biometrische Passbilder Herstellen
Vor längerer Zeit habe ich mich damit beschäftigt, wie man selbst biometrische Passbilder erstellen kann, da ich keine Lust hatte für ein einziges Foto 10 € auszugeben.Meine Übungen konnte ich seit dem letzten Jahr auch mehrfach einsetzen, um Passbilder für Flüchtlinge zu machen, die sie an verschiedenen Stellen, z.B. bei einem bewilligten Asylantrag benötigen.
Die entsprechenden Regeln, die man beachten muss sind als„Passbild-Schablone für Personen ab einem Alter von 10 Jahren“ bei der Bundesdruckerei verfügbar.Außer einer vernünftigen Kamera und einem Bildbearbeitungsprogramm (ich verwendeGIMP) ist so mit einem Fotodrucker und Fotopapier oder den Foto-Druckangeboten in einigen Drogerien die Herstellung eines biometrische Passbilds für unter einem Euro möglich.
Für meine eigene Dokumentation und, um anderen eine hoffentlich hilfreiche Anleitung zu geben, habe ich eine entsprechende Notiz angelegt:Biometrische Passbilder Herstellen
(read on …)My New Webpage
Welcome to my new web page and blog.This time I’ve built the page usingjekyll and using a custom theme, based on bootstrap, by taking some inspirations and HTML/CSS snippets from bootstrap’sblog andcarousel examples.For the typography I’m usingOpen Sans andLato andFont Awesome for the icons.The Publications section was implemented usingExhibit and taking my publications frombibsonomy.
The web page has four sections, this one is the “Blog”, where I’m publishing several things which pop into my head.The “Notes” section should be some kind of an open idea management system resp. personal Wiki.In the section “Project” I present some project, which I’m working on and finally my “Publications”.
The source code for my homepage is published on github.On the server side I’m making use ofdocker, especially a setup ofjwilder’s reverse proxy and thedockerjekyllpages image by Don McNamara to rebuild the blog, triggered by pushes to my git repository.In addition to the jwilder container, I’m using theLet’s Encrypt companion by Yves Blusseau, to make the site available via HTTPS.
My webpage is bi-lingual, which means in this case, that I’m sometimes writing text in German and sometimes in English.I’m if you have problems understanding a text but think, it might be interesting, don’t hesitate to ask me for a translation (but I can’t guarantee anything).Currently this page has not too much content, but I’m planning to gradually integrate some interesting posts form my old blog and also build a live integration of mytwitter stream.
(read on …)