projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f4f440a) | patch
Update howto using-topic-branches
authorLuck, Tony <tony.luck@intel.com>
Tue, 8 Nov 2005 23:52:02 +0000 (15:52 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 9 Nov 2005 05:33:36 +0000 (21:33 -0800)
commitf37d0cc3ff6ef565f961a0d3741ba016e1ceb31d
treee447f9f8590980f81ffed585c0236e3beae6a5betree | snapshot
parentf4f440a039587c14ca29a8fe127b4d5273eacafccommit | diff
Update howto using-topic-branches

"git resolve" is being deprecated in favour of "git merge".
Update the documentation to reflect this.

Signed-off-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Documentation/howto/using-topic-branches.txt diff | blob | history
The core git plumbing