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)
commit2928031...f0282857360add2b49db5fc7148d4813
treef251f38...59d56d54d8274e387815aae61560d11ccopy hash to clipboard (tree)
parent30f2bad...84a3f6961b38579c1c23c64b72f64f24copy hash to clipboard (diff)
Documentation/git-merge.txt