summaryrefslogtreecommitdiff
path: root/git-cvsexportcommit.perl
diff options
context:
space:
mode:
authorLuck, Tony <tony.luck@intel.com>2005-11-08 23:52:02 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-11-09 05:33:36 (GMT)
commitf37d0cc3ff6ef565f961a0d3741ba016e1ceb31d (patch)
treee447f9f8590980f81ffed585c0236e3beae6a5be /git-cvsexportcommit.perl
parentf4f440a039587c14ca29a8fe127b4d5273eacafc (diff)
downloadgit-f37d0cc3ff6ef565f961a0d3741ba016e1ceb31d.zip
git-f37d0cc3ff6ef565f961a0d3741ba016e1ceb31d.tar.gz
git-f37d0cc3ff6ef565f961a0d3741ba016e1ceb31d.tar.bz2
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>
Diffstat (limited to 'git-cvsexportcommit.perl')
0 files changed, 0 insertions, 0 deletions