From owner-freebsd-git@freebsd.org Thu Jun 25 20:02:31 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 B1DBE343F50 for ; Thu, 25 Jun 2020 20:02:31 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-il1-f170.google.com (mail-il1-f170.google.com [209.85.166.170]) (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 49t9sg2lp4z4Wng; Thu, 25 Jun 2020 20:02:31 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-il1-f170.google.com with SMTP id k6so6467392ili.6; Thu, 25 Jun 2020 13:02:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=yHVxrlSy80uTZP4cNiN97kGKHiO2nKL3Nh6VjDan/08=; b=P6RLUFFcARR/DriffC77YRVPk9EEQnVIzXA0PFe6VoN17bQkPE52sL6bpW0uAsUqq6 3KDSwrL4PARTK+V78VLJ2GbGQW9TmfD4jBCrPHp5rhRpFgFSSCyDxdPjRlZSYVuZEmE1 vjiSE4EhPFWnnPYAz8UG5l+/Om2t16ossz4XW6iZzOFx2WFYykbi1oEC7F3g/R/uoROn mRWKKoB9tEWMCib2UNm4sUuVzdhOxk2XZSrfXSDZss0yqQ67BlxS6QEjmIfE5ib/eWis 8NeIsqR8dxCzD/qIbauy/wbzLv4yuOwYmUhRqu66FkeMI0T3w3zeT61ZnfiniWpaQVLu PRAw== X-Gm-Message-State: AOAM530frN2xY8JR+zfI+dgo6/Iy9qq398rjs69A7ComWiqtcbptTMah 0pKSDnx9T4x0qsQ4lVfjFk6Gl+5VV5ftVkjQxXOo8Q== X-Google-Smtp-Source: ABdhPJx5N7cRxiqayKZntlSD8mQN3o/KeK5L2TN8VNg2kQrKejLTAFZ0odDyvak4V38HJi1TyXzCoLfN2WXBvBS5+BY= X-Received: by 2002:a05:6e02:962:: with SMTP id q2mr26737142ilt.256.1593115349060; Thu, 25 Jun 2020 13:02:29 -0700 (PDT) MIME-Version: 1.0 References: <5b1b2132-d3ed-96b6-1e48-18c3ea515970@FreeBSD.org> In-Reply-To: From: Ed Maste Date: Thu, 25 Jun 2020 16:02:17 -0400 Message-ID: Subject: Re: svn primer translation to git To: Mitchell Horne Cc: Renato Botelho , freebsd-git@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 49t9sg2lp4z4Wng X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; REPLY(-4.00)[] 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 20:02:31 -0000 On Thu, 25 Jun 2020 at 09:48, Mitchell Horne wrote: > > We should advise users to set pull.rebase in their configuration, > either globally in ~/.gitconfig or on the repository-level in > .git/config. It seems that newer versions of git will print a warning > if neither pull.ff or pull.rebase is set. It's unfortunate that we > can't include config files as part of the repository, so this will > always need to be done manually. I agree it's unfortunate we can't set repository-level defaults that come along with the initial clone. We could have a script though that users can run to display or adjust the appropriate settings, perhaps. Our standard quickstart instructions could be something like % git clone foo@cgit-beta.freebsd.org/src.git % cd src % sh tools/git-repo-init.sh