diff options
| author |  Michael J Gruber <git@drmicha.warpmail.net> | 2010-03-15 11:54:46 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-03-15 15:25:17 -0700 |
| commit | 7325283987430f94712713313c5089e5143f2e17 (patch) | |
| tree | 99f5ddfd345a13d85c4d08ef880a4d6835a6aa9b /Documentation/git-pull.txt | |
| parent | Documentation/git-read-tree: fix table layout (diff) | |
| download | tgif-7325283987430f94712713313c5089e5143f2e17.tar.xz | |
Documentation/git-read-tree: clarify 2-tree merge
Clarify the description of the 2-tree merge by defining the terms
which are used in the table, and by applying some small linguistic
changes.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-pull.txt')
0 files changed, 0 insertions, 0 deletions