summaryrefslogtreecommitdiff
path: root/Documentation/git-read-tree.txt
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2010-01-23 03:45:33 -0600
committerThomas Rast <trast@student.ethz.ch>2010-01-24 13:57:42 +0100
commit29280311f0282857360add2b49db5fc7148d4813 (patch)
treef251f38f59d56d54d8274e387815aae61560d11c /Documentation/git-read-tree.txt
parent30f2bade84a3f6961b38579c1c23c64b72f64f24 (diff)
downloadgit-29280311f0282857360add2b49db5fc7148d4813.tar.gz
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>
Diffstat (limited to 'Documentation/git-read-tree.txt')
0 files changed, 0 insertions, 0 deletions