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()
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to