tomster

About

Accounts

Newer posts are loading.

You are at the newest post.
Click here to check if anything new just came in.

February 07 2010

13:20

omg, now it does -.-

Reposted from

jessor via

nibbler

#
React
Share

February 06 2010

18:44

“ The most exciting phrase to hear in science, the one that heralds new discoveries, is not "Eureka!" but "That's funny..." ”

— Isaac Asimov

Reposted from

nibbler via

brightbyte

#
React
Share

10:49

→ ptrace.fefe.de

At least some parts of the industry are being honest about their audience :) via fefe

Reposted by

#
React
Share

February 04 2010

14:19

→ selleckwaterfallsandwich.tumblr.com

Ok, I give up. Words simply fail me... Selleck Waterfall Sandwich

Reposted by

Kung-Li-J

#
React
Share

14:08

→ www.knesebeck-verlag.de

NERDS

Nachrichten-Erkennungs-Rettungs-Dienstliches Sonderkommando

Reposted by

ingrim

#
React
Share

11:34

→ blog.pantoffelpunk.de

Reposted from

tomate via

nibbler

#
React
Share

February 03 2010

22:51

“ Allerdings, und das ist der Grund, warum ich diese Geschichte auch in die Öffentlichkeit trage, kann ich es nicht akzeptieren, daß der CCC in eine linksradikale Ecke gestellt wird, und eine Mitgliedschaft in unserem Verein Grund für eine Behinderung der Berufsausübung ist. Satzungsziel des CCC e.V. ist die Wahrung des Grundrechts auf Meinungs- und Informationsfreiheit im digitalen Zeitalter. Wir sind nicht "gegen das System", sondern wir sind für das System im Sinne unserer verfassungsmäßigen Grundrechte. Und das muß auch damit vereinbar sein, beruflich aktiv an der Gestaltung unseres Staates mitzuwirken. ”

— Rauswurf vom Polizeikongress: "Zum Sicherheitsrisiko erklärt" - taz.de

Reposted from

streetcleaner via

brightbyte

#
Comment
Share

February 02 2010

08:21

Play fullscreen

Vogelperspektive : netzpolitik.org

Reposted from

sockenstau via

brightbyte

#
Comment
Share

January 30 2010

09:49

Play fullscreen

From the "Funny cuz it's true"-Department - Charlie Brooker - How To Report The News

Reposted by

#
React
Share

January 29 2010

14:03

Reposted from

oll via

brightbyte

#
React
Share

January 24 2010

00:26

→ www.novaksblog.com

Reposted from

Erikmitk via

foosel

#
React
Share

00:24

→ chan.geekosphere.org

fucking epic!!1!

Reposted from

telefonmann via

foosel

#
Comment
Share

January 22 2010

00:00

Reposted from

Advertime via

mzeltner

#
React
Share

January 20 2010

14:04

→ nvie.com

The --no-ff flag causes the merge to always create a new commit object, even if the merge could be performed with a fast-forward. This avoids losing information about the historical existence of a feature branch and groups together all commits that together added the feature.

In the latter case, it is impossible to see from the Git history which of the commit objects together have implemented a feature—you would have to manually read all the log messages. Reverting a whole feature (i.e. a group of commits), is a true headache in the latter situation, whereas it is easily done if the --no-ff flag was used.

Yes, it will create a few more (empty) commit objects, but the gain is much bigger that that cost.

Unfortunately, I have not found a way to make --no-ff the default behaviour of git merge yet, but it really should be.

Tags: git

#
React
Share

13:31

A successful Git branching model

In this post I present the development model that I’ve introduced for all of my projects (both at work and private) about a year ago, and which has turned out to be very successful. I’ve been meaning to write about it for a while now, but I’ve never really found the time to do so thoroughly, until now. I won’t talk about any of the projects’ details, merely about the branching strategy and release management.

Reposted from