Pages

▼
Tuesday, May 3, 2016

Fun with a new feature in recent Git

›
It is not exactly a  new  feature,  but I find myself using the --sort  option of git branch a lot more often than before these days. The...
Thursday, October 15, 2015

Fun with recreating an evil merge

›
Sometimes we wish there were good ways to recreate a complex merge, replaying a previously resolved conflict resolution, and reapplying a pr...
2 comments:
Monday, July 27, 2015

Git 2.5

›
The latest feature release Git v2.5.0 is now available at the usual places . It is comprised of 583 non-merge commits since v2.4.0, contrib...
Monday, June 29, 2015

Fun with "git blame -s"

›
After applying a patch that moves a bulk of code that was placed in a wrong file to its correct place, a quick way to sanity-check that the ...
Thursday, June 25, 2015

Git 2.4.5

›
The latest maintenance release for Git v2.4.x series has been tagged. The setup code used to die when core.bare and core.worktree are se...

Git 2.5-rc0 early preview

›
An early preview of the upcoming Git 2.5 has been tagged as v2.5.0-rc0. It is comprised of 492 non-merge commits since v2.4.0, contributed b...
Tuesday, May 26, 2015

Git 2.4.1 and 2.4.2

›
Today, the v2.4.2 maintenance release was tagged. Compared to v2.4.0 that was released end of April 2015 (i.e. last month), in addition to m...
Saturday, April 25, 2015

Fun with failing cherry-pick

›
I just encountered an interesting cherry-pick failure. The change I was trying to cherry-pick was to remove a hunk of text. Its patch conc...
Thursday, April 2, 2015

First release candidate for Git 2.4

›
This release has a few changes in the user-visible output from Porcelain commands. These are not meant to be parsed by scripts, but the user...
Monday, March 30, 2015

Fun with Non-Fast-Forward

›
Your push may fail due to “non fast-forward”. You start from a history that is identical to that of your upstream, commit your work on top ...