| commit | 29280311f0282857360add2b49db5fc7148d4813 | |
| author | Jonathan Nieder <jrnieder@gmail.com> | |
| Sat, 23 Jan 2010 09:45:33 +0000 (23 03:45 -0600) | ||
| committer | Thomas Rast <trast@student.ethz.ch> | |
| Sun, 24 Jan 2010 12:57:42 +0000 (24 13:57 +0100) | ||
| tree | f251f38f59d56d54d8274e387815aae61560d11c | treesnapshot (tar.gz zip) |
| parent | 30f2bade84a3f6961b38579c1c23c64b72f64f24 | commitdiff |
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>
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 | diffblobblamehistory |