19 Feb
2009
19 Feb
'09
3:37 p.m.
On Feb 19, 2009 at 00:11, Jan Janak <jan(a)iptel.org> wrote:
Andrei,
So this is a merge of janakj/flatstore into master with --no-ff option
(otherwise the merge would have resulted in a fast-forward merge again).
I think I like this variant better, because it actually records that the stuff
was merged from another branch and it looks better (at least to my eyes) in
the tree graph in gitk.
So I'd recommend we use --no-ff with git-merge by default.
I've updated the wiki
(https://sip-router.org/wiki/git/quick-start-guide).
Andrei