![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Luck, Tony <tony.luck@intel.com> | |
| Tue, 8 Nov 2005 23:52:02 +0000 (15:52 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Wed, 9 Nov 2005 05:33:36 +0000 (21:33 -0800) | ||
| commit | f37d0cc3ff6ef565f961a0d3741ba016e1ceb31d | |
| tree | e447f9f8590980f81ffed585c0236e3beae6a5be | tree | snapshot |
| parent | f4f440a039587c14ca29a8fe127b4d5273eacafc | commit | 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>
"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 |