projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 30f2bad) | patch
Documentation: merge: add a section about fast-forward
authorJonathan Nieder <jrnieder@gmail.com>
Sat, 23 Jan 2010 09:45:33 +0000 (03:45 -0600)
committerThomas Rast <trast@student.ethz.ch>
Sun, 24 Jan 2010 12:57:42 +0000 (13:57 +0100)
commit29280311f0282857360add2b49db5fc7148d4813
treef251f38f59d56d54d8274e387815aae61560d11ctree | snapshot
parent30f2bade84a3f6961b38579c1c23c64b72f64f24commit | diff
Documentation: merge: add a section about fast-forward

Novices sometimes find the behavior of 'git merge' in the
fast-forward case surprising.  Describe it thoroughly.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Documentation/git-merge.txt diff | blob | history
Git—the stupid content tracker