| commit | 7325283987430f94712713313c5089e5143f2e17 | |
| author | Michael J Gruber <git@drmicha.warpmail.net> | |
| Mon, 15 Mar 2010 10:54:46 +0000 (15 11:54 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 15 Mar 2010 22:25:17 +0000 (15 15:25 -0700) | ||
| tree | 99f5ddfd345a13d85c4d08ef880a4d6835a6aa9b | treesnapshot (tar.gz zip) |
| parent | 71928f7f11355a25873b9693e9009acad31f40ef | commitdiff |
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>
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>
| Documentation/git-read-tree.txt | diffblobblamehistory |