Date: Mon, 6 Aug 2018 01:08:43 +0000 (UTC) From: Ben Widawsky <bwidawsk@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r337365 - head/tools/tools/git Message-ID: <201808060108.w7618hFx092371@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bwidawsk Date: Mon Aug 6 01:08:43 2018 New Revision: 337365 URL: https://svnweb.freebsd.org/changeset/base/337365 Log: git-svn-init: Clarify branch creation commands Suggested by: eadler Reviewed by: eadler Approved by: emaste (mentor) Differential Revision: https://reviews.freebsd.org/D16593 Modified: head/tools/tools/git/git-svn-init (contents, props changed) Modified: head/tools/tools/git/git-svn-init ============================================================================== --- head/tools/tools/git/git-svn-init Sun Aug 5 22:24:38 2018 (r337364) +++ head/tools/tools/git/git-svn-init Mon Aug 6 01:08:43 2018 (r337365) @@ -119,11 +119,9 @@ git_checkout() # Arrange to have 'master' reference 'trunk' ${GIT} checkout trunk - # Delete master - ${GIT} branch -D master - - # Make master really be trunk - ${GIT} checkout -b master trunk + # Make master reference trunk + ${GIT} branch --force master trunk + ${GIT} checkout master } rebase()
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808060108.w7618hFx092371>