Profile cover photo
Profile photo
Johan Andersson
27 followers -
The quiet mind.
The quiet mind.

27 followers
About
Posts

Post has attachment
Lego data.
What Happened with LEGO
What Happened with LEGO
therealityprose.wordpress.com
Add a comment...

Post has attachment
Unmenschlich.
Add a comment...

Post has shared content

Post has shared content
Afraid to pull? Try the git up alias.
Instead of git pull, I recommend creating and using the following git up alias:

git config --global alias.up '!git remote update -p; git merge --ff-only @{u}'

This alias downloads all of the latest commits from all upstream branches (pruning the dead branches) and tries to fast-forward the local branch to the latest commit on the upstream branch. If successful, then there were no local commits, so there was no risk of merge conflict. The fast-forward will fail if there are local (unpushed) commits, giving you an opportunity to review the upstream commits before taking action.

This still modifies your working directory in unpredictable ways, but only if you don't have any local changes. Unlike git pull, git up will never drop you to a prompt expecting you to fix a merge conflict.

Another Option: git pull --ff-only --all -p

The following is an alternative to the above git up alias:

git config --global alias.up 'pull --ff-only --all -p'

This version of git up has the same behavior as the previous git up alias, except:

the error message is a bit more cryptic if your local branch isn't configured with an upstream branch
it relies on an undocumented feature (the -p argument, which is passed to fetch) that may change in future versions of Git

Post has shared content
I love the experience, perspective and enthusiasm of Virding and Armstrong.
Bad audio, great content. Basically an insight into the basic concepts behind Erlang: Where it is coming from, what it is today and where it is going to wrapped in a light discussion.
Add a comment...

Post has shared content
Add a comment...

Post has shared content
Unicode is fun!
Most string types are wrongly handling unicode compose characters
·
Here is a great blog article pointing out various common issues with Unicode handling, open your favorite text editor and test for yourself. E.g. advancing across "noël" in Gedit counts 5 characters instead of the expected 4.
Add a comment...

Post has attachment
I like histories like this. It's hard to imagine "that it was a widely held opinion at the time that 'lexical scope is interesting, theoretically, but it's inefficient to implement; dynamic scope is the fast choice.'"
Add a comment...

Post has shared content

Post has shared content
Pascal's wager for audiophiles!
Please, please, please stop 'burning in' your earphones. It's a bunch of hokum.

http://wrd.cm/17cicLn
Photo
Add a comment...
Wait while more posts are being loaded