Search by tag: git
7 articles
GitLab: set a branch as default target for merge requests
Do you also find it tedious to have to change the target branch, each time you create a merge request? Or worse, the @#$% moment when you realise you forgot to change it from the default master/main at all? To avoid such inconvenience in the future, you can set another default branch in Settings =>…
[Git] List the files which have been modified between two commits/tags
I needed to know the exact list of files that had been modified between my last two tags: You can replace the tags by commits: Source
Merge two versions of a file with git-checkout
I have slightly different i3 configuration files between my desktop and laptop computers. In this case, the laptop keyboard is missing a Play/Pause multimedia key. This is where the two files differ: the laptop has a different key binding for running the music player. Having recently added new…
Nuke (remove all traces) of a file in Git history
First note: if you are not alone on the project, consult with your colleagues before doing this. Because we are about to rewrite history and other contributors will be forced to manually rewrite their history too. Second note: if what you want to remove is sensitive material (e.g. passwords),…
How to restore a branch deleted too quickly in Git?
Still not having the automatic reflexes for applying a successful Git branching model, I cleaned up my working repository a little too fast by deleting a hot-fix branch after merging it into the master branch. When I came back to the development branch I was working on before the emergency, I…