From owner-svn-src-head@freebsd.org Tue Jun 19 21:58:05 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3F1861011742; Tue, 19 Jun 2018 21:58:05 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E950F78041; Tue, 19 Jun 2018 21:58:04 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C36F5196FD; Tue, 19 Jun 2018 21:58:04 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5JLw4Kx052097; Tue, 19 Jun 2018 21:58:04 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5JLw4SQ052096; Tue, 19 Jun 2018 21:58:04 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201806192158.w5JLw4SQ052096@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Tue, 19 Jun 2018 21:58:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r335388 - head/tools/tools/git X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/tools/tools/git X-SVN-Commit-Revision: 335388 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Jun 2018 21:58:05 -0000 Author: imp Date: Tue Jun 19 21:58:04 2018 New Revision: 335388 URL: https://svnweb.freebsd.org/changeset/base/335388 Log: Fix typo noticed by pstef@. Modified: head/tools/tools/git/HOWTO Modified: head/tools/tools/git/HOWTO ============================================================================== --- head/tools/tools/git/HOWTO Tue Jun 19 21:26:23 2018 (r335387) +++ head/tools/tools/git/HOWTO Tue Jun 19 21:58:04 2018 (r335388) @@ -147,7 +147,7 @@ III. git-svn-rebase git-svn-rebase is a script that helps you keep current when using git plus subversion as outline in https://wiki.freebsd.org/GitWorkflow/GitSvn -since it's otherwise a pain to have many branhes active. It will rebase +since it's otherwise a pain to have many branches active. It will rebase those branches that haven't been merged yet. Some tweaking may be needed if you have other, weird branches in your tree (including any stable branches). To run it just cd into the git subversion tree somewhere and