From owner-freebsd-git@freebsd.org Thu Jun 25 12:56:25 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2065D35A866 for ; Thu, 25 Jun 2020 12:56:25 +0000 (UTC) (envelope-from garga.bsd@gmail.com) Received: from mail-qk1-x730.google.com (mail-qk1-x730.google.com [IPv6:2607:f8b0:4864:20::730]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49t0Q01nBZz43Wk; Thu, 25 Jun 2020 12:56:23 +0000 (UTC) (envelope-from garga.bsd@gmail.com) Received: by mail-qk1-x730.google.com with SMTP id r22so5092642qke.13; Thu, 25 Jun 2020 05:56:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:to:references:from:organization:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=J/OZLoIrA6Pu/7FOjAPKexjXI6Oc8d9WIdL6Vwq9q+0=; b=OnCsWU6120VTAAK4CA7AOypQjwCYQ/jEU6HSmCtYEo86fTya+oCwadXFUoE3K7hOng hYBfp8tPArL4auNgWrqafj9355FOM/bVZxUgZ3SiunMJL/+9SzHatq+VV5pdiKQGeRtT b5Iwl4ILX6yVOzcBGjXhfTowqDy88ZptDJVTm/t4cVfRINhJxOtAJJ20gOStDklYZOk+ xmLlXeyFiNbP4f43le8yxW5ADjswHSVh+oRQYBxmpnITBUuf9Nf7Wr+g0oBQipYseDrt DajTPhCQP1/c7Z1CyHUK5LfqKXRpGvNdiHrx+Y9oFjVpibUGsSxUp/rwIK6nCj5RTSkE fszw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:to:references:from:organization :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=J/OZLoIrA6Pu/7FOjAPKexjXI6Oc8d9WIdL6Vwq9q+0=; b=Cu5ZvhqmlFywLkag82hIMuFeO0kaNa+KIxvRpZeSdrjD5Ax/fGjpSSf0gAKmgqfTi+ nFXKwrpI2PZEvopd7nQnl3JBQbOXajSdt1V1y467+GP951YAZeRTotRbxBO5YemC9GdT sITn61AszBv5ICVac3mPxdq6+nQkYCPFD/GXVQsRXnKORXd8yhNEClW2BkNHZaA/o+rf 1W2hAd3qUqWeU6hRkjxAVRUVEvyOPao7BB6smlDIaU1czr0hFYFWny7UlwxDIIbGiobN Ny9GAXQlSHlu8movO0tcGkKOS3ydb9LFEEq1Pp4ma7yuX8avMmJ1EHOaKH08rK5Lq4AF p8cA== X-Gm-Message-State: AOAM532hqeVQchCVtGyQpjAEIR2iYPZmev3/mpCh56mSDfFnmZRpzi/p aluhbh26+4Qp3fnirRetc/3YJQJw X-Google-Smtp-Source: ABdhPJxzgsJkVggwzZbL4KSmx9118K6v8X4iz4OyVTTsAwLIBQ4mLk4jTTfF+S1QTnrBALLlglD9Lw== X-Received: by 2002:a37:a89:: with SMTP id 131mr29313154qkk.92.1593089782811; Thu, 25 Jun 2020 05:56:22 -0700 (PDT) Received: from mbp.home ([2804:f1c:7300:de00:6d80:2c73:9cf2:2d0d]) by smtp.gmail.com with ESMTPSA id d79sm5865753qkb.101.2020.06.25.05.56.21 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 25 Jun 2020 05:56:22 -0700 (PDT) Sender: Renato Botelho Subject: Re: svn primer translation to git To: Ed Maste , freebsd-git@freebsd.org References: From: Renato Botelho Organization: FreeBSD Message-ID: <5b1b2132-d3ed-96b6-1e48-18c3ea515970@FreeBSD.org> Date: Thu, 25 Jun 2020 09:56:19 -0300 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:78.0) Gecko/20100101 Thunderbird/78.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 49t0Q01nBZz43Wk X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=OnCsWU61; dmarc=none; spf=pass (mx1.freebsd.org: domain of gargabsd@gmail.com designates 2607:f8b0:4864:20::730 as permitted sender) smtp.mailfrom=gargabsd@gmail.com X-Spamd-Result: default: False [-2.84 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; RCVD_TLS_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36:c]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[FreeBSD.org]; NEURAL_HAM_LONG(-1.00)[-1.004]; MID_RHS_MATCH_FROM(0.00)[]; HAS_ORG_HEADER(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; NEURAL_HAM_MEDIUM(-0.98)[-0.979]; DKIM_TRACE(0.00)[gmail.com:+]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::730:from]; NEURAL_HAM_SHORT(-0.66)[-0.658]; FORGED_SENDER(0.30)[garga@FreeBSD.org,gargabsd@gmail.com]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; TAGGED_FROM(0.00)[]; FROM_NEQ_ENVFROM(0.00)[garga@FreeBSD.org,gargabsd@gmail.com] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2020 12:56:25 -0000 On 24/06/20 13:34, Ed Maste wrote: > We currently have a FreeBSD Subversion primer in the committer's guide: > https://www.freebsd.org/doc/en_US.ISO8859-1/articles/committers-guide/subversion-primer.html > > I've started a translation of this into a Git primer, at: > https://hackmd.io/ML5TSl8mQ5-27B5eqDf7YA?view > > I'm particularly interested in feedback on how much git background / > theory of operation we want to include here (vs referring to external > documentation). Thank you for writing this document! Based on what I saw in other projects when people moved to git, a common mistake that happens is people abusing `git pull` and creating merges where it's not desired, like in main branch when bringing remote changes to local modified repository. Maybe it's worth to add a paragraph saying some words about always use rebase instead of merge. -- Renato Botelho