projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a4081ba) | patch
Documentation: merge: add an overview
authorJonathan Nieder <jrnieder@gmail.com>
Sat, 23 Jan 2010 09:42:46 +0000 (03:42 -0600)
committerThomas Rast <trast@student.ethz.ch>
Sun, 24 Jan 2010 12:57:42 +0000 (13:57 +0100)
commitb40bb374a618534b930ce4da5ffffb215b5cb488
tree30959fdf1e176374bf7d24aee9c3f273e14334dftree | snapshot
parenta4081bacfc78c1e1843590ed8d87544f3873dd10commit | diff
Documentation: merge: add an overview

The reader unfamiliar with the concepts of branching and merging
would have been completely lost.  Try to help him with a diagram.

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