From owner-freebsd-current@freebsd.org Sat Jan 16 18:47:58 2021 Return-Path: Delivered-To: freebsd-current@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 6EBD14E7A9A for ; Sat, 16 Jan 2021 18:47:58 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io1-f54.google.com (mail-io1-f54.google.com [209.85.166.54]) (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 4DJ6W155F1z4ffw for ; Sat, 16 Jan 2021 18:47:57 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io1-f54.google.com with SMTP id d81so9670488iof.3 for ; Sat, 16 Jan 2021 10:47:57 -0800 (PST) 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=7HxSyiDMlFyTF3DUExfSqb4yLF3XGC7JxWPnpjRafm8=; b=qsDnWHBTbWAMjaD0EvZ+ElIxxFEZJwEt807ZZcZWxjhQzXGPFpL4Hoz5lgiYJTjB4y lbON15Z89h8fGWrig3R0YKOEKDNbvaY2M3wiO20/SguY9UlqS9UMLOC/mbD+oVahgSg6 ZismO9uI5fotW2lrvcye+SwSNxCvT0VJwK5bDNq7N8FdlPS5lWfIWAlk4PcvZlxBWewF unDMbat9OPXcXBq72bOoH0xrBylBdMcdyF8xB/mw3PCXw6tKzHrjHEyxCzNdL1ptYnm9 E8V1U43dL1j448Bt/lpSzE218i0OZoSijRpcjk3iJkQv1tPWjzMBqOKYCvDemhgIrZJC WRyg== X-Gm-Message-State: AOAM530RoEG/T806Xiu92aLbUL3oO0+H4A5BdBCO9uLQSYoZuMRzEyDE yekqEF+z0kUCFr+TzL9gp+N/YEdoH9rC4DI8TNn57e+zIAMk3w== X-Google-Smtp-Source: ABdhPJyCnv0lFNOqF+ddvnqP69N8gDJV0tCN+9NDBDVdpVn1Niv8sJ6OMcJDD58qczqK7xMQ+yt3yUK+P8dbV4uDiZA= X-Received: by 2002:a05:6e02:d50:: with SMTP id h16mr15197688ilj.256.1610822876547; Sat, 16 Jan 2021 10:47:56 -0800 (PST) MIME-Version: 1.0 References: <20210116183528.GA41499@troutmask.apl.washington.edu> In-Reply-To: <20210116183528.GA41499@troutmask.apl.washington.edu> From: Ed Maste Date: Sat, 16 Jan 2021 13:47:37 -0500 Message-ID: Subject: Re: git equivalent of 'svn update' To: Steve Kargl Cc: FreeBSD Current Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4DJ6W155F1z4ffw X-Spamd-Bar: -- X-Spamd-Result: default: False [-3.00 / 15.00]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; TO_DN_ALL(0.00)[]; NEURAL_HAM_SHORT(-1.00)[-0.998]; RCPT_COUNT_TWO(0.00)[2]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; MIME_TRACE(0.00)[0:+]; RBL_DBL_DONT_QUERY_IPS(0.00)[209.85.166.54:from]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[emaste@freebsd.org,carpeddiem@gmail.com]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FREEFALL_USER(0.00)[carpeddiem]; R_DKIM_NA(0.00)[]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-current@freebsd.org]; DMARC_NA(0.00)[freebsd.org]; SPAMHAUS_ZRD(0.00)[209.85.166.54:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.166.54:from]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.166.54:from]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-current] X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Jan 2021 18:47:58 -0000 On Sat, 16 Jan 2021 at 13:35, Steve Kargl wrote: > > In the git world, what is the equivalent of 'svn update' > within a subdirectory of the /usr/src hierarchy. You can use something like % git checkout freebsd/main sys/dev/bge to update just sys/dev/bge to match freebsd/main. This will leave you with staged changes which you can then commit (locally).