Recent Changes

2020-04-18

• 12:06 UTC (new) (history) 2020-04-18 The main line of history of some branch . . . . Marcin Borkowski – Some time ago, it occurred to me that it would be cool to be able to see the history of some branch of my Git repository – say, develop – but filtered so that I could only see the commits done directly on develop (which do not happen very often) and merge commits indicating that some feature got merged into develop, but without the individual commits. This could then serve as a poor man’s changelog - a list of features committed to develop since e.g. last tagged version.

2020-04-12

• 07:32 UTC (new) (history) 2020-04-12 Easter 2020 . . . . Marcin Borkowski – According to the tradition of my blog, I wish everyone reading this Happy Easter. May the Christ Risen give you His graces every day, and I wish you deep faith in Him. Do not forget that He is stronger than economic crises and physical or mental illnesses. This is no surprise, since He is in fact stronger than something much more serious than that – He defeated all our sins combined. In other words, we have all the right reasons to sing with joy, even if there are also some reasons to cry. As usual, I am going to offer a decade of the Holy Rosary for all my readers. God bless you all!

2020-04-06

• 15:15 UTC (new) (history) 2020-04-06 Printing from the command line . . . . Marcin Borkowski – Recently, I decided that the time has come to go through another geek rite of passage and to learn how to print files from the command line. Being on GNU/Linux, I (of course) use CUPS for printing.

2020-03-28

• 18:40 UTC (new) (history) 2020-03-28 psql as a PostgreSQL teacher . . . . Marcin Borkowski – A week ago, one of the commenters of my post from two weeks ago asked about the way to do stuff like \d (“describe table”) or \l (list the databases) etc. from SQL blocks in Org-mode. Well, the answer is – rather expectedly – “this is PostgreSQL, of course it’s possible”. Here’s how psql can teach you how to do it.

2020-03-23

• 22:14 UTC (diff) (history) Comments on 2020-03-09 Using Org-mode as a PostgreSQL client . . . . Marcin Borkowski – Hi, thanks for all the comments! I'm very busy now, but I will address them in another post in a week or two -- stay tuned!
• 22:11 UTC (new) (history) 2020-03-23 A rebase trick with disappearing commit . . . . Marcin Borkowski – Today, while working with Git, I discovered a very nice feature. I was working on a dedicated feature branch. Suddenly I discovered a bug which had to be fixed in order for that feature branch to make sense. However, the bug was not really connected with the feature I was working on. Well, it was connected in a sense, but it could affect other things as well, and I decided it should be fixed much earlier than I could possibly finish working on that feature – in other words, it deserved its own branch, based on the develop branch. So, I stashed my work, switched the current branch to develop, created a fixbug branch, fixed the bug, created a merge request and asked a colleague to review it. But here’s the deal: I could not work on my feature without that particular bug fixed. On the other hand, I wanted my feature branch to be based on develop and not on some other, random branch (well, that would work, but I like the history to be as clean as possible). What to do?

More...