]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: fb612d5) | patch
Tutorial: do not use 'git resolve'.
authorJunio C Hamano <junkio@cox.net>
Tue, 8 Nov 2005 06:50:57 +0000 (22:50 -0800)
committerJunio C Hamano <junkio@cox.net>
Tue, 8 Nov 2005 08:23:12 +0000 (00:23 -0800)
commit067744bd5dc23540745788b5aa11d4e9dea1ceef
tree2058c03a324f06aff5d506574e55658da4c730actree | snapshot
parentfb612d54c1df7e45d174060c1cbdf060accceb6dcommit | diff
Tutorial: do not use 'git resolve'.

Use 'git merge' instead.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Documentation/tutorial.txt diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.