From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Kelvin White Newsgroups: gmane.emacs.devel Subject: Re: A simple git workflow for the rest of us Date: Sat, 15 Nov 2014 15:54:42 -0500 Message-ID: References: <87sihkicso.fsf@Rainer.invalid> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/alternative; boundary=089e013d202a6c9db70507ebf41b X-Trace: ger.gmane.org 1416084901 6831 80.91.229.3 (15 Nov 2014 20:55:01 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 15 Nov 2014 20:55:01 +0000 (UTC) Cc: Emacs development discussions To: Achim Gratz Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 15 21:54:54 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XpkMu-0003QX-Bt for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 21:54:52 +0100 Original-Received: from localhost ([::1]:41953 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpkMu-00067a-0B for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 15:54:52 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:59453) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpkMq-00067V-Sa for emacs-devel@gnu.org; Sat, 15 Nov 2014 15:54:49 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XpkMm-0007AW-39 for emacs-devel@gnu.org; Sat, 15 Nov 2014 15:54:48 -0500 Original-Received: from mail-wg0-x235.google.com ([2a00:1450:400c:c00::235]:61824) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpkMl-0007AO-SL for emacs-devel@gnu.org; Sat, 15 Nov 2014 15:54:44 -0500 Original-Received: by mail-wg0-f53.google.com with SMTP id b13so21940172wgh.12 for ; Sat, 15 Nov 2014 12:54:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=zI8N3JH5rizgI9OOeyvlKQOkbybtZPHcP3vEq4MBtU0=; b=P7wWVG1iLd0FKoVvCf2sZ+7N9x+fKTQ/PujJOwdyQp6gjayjGsqPgrJL8DD+w1qDc8 35inEiNbBh6fmf8urESg8phIsOUymxM9imW0I5diuS+OamwEXOYp2tt3bkrc6vN/UIF4 lU4O3NhQZEFTD1FNrIH4HY1Wl56cE60nQc9QRtq+NSnR3iGgvCJy8lBd0h3qk/a404cp Qijn/7WK8abnKveQAHz3MNwH/UxKiqoh9LyMF/peAc0Pm8KxGZ/CGWWlN8PSRPhGc4ZV suwwe2ithEfSzwdzjHPjG73JK9sHn1j1Kd5YPWR6/vfheFrE4ffrSd6woMv9DlKKbCNf vEmg== X-Received: by 10.194.248.195 with SMTP id yo3mr25318982wjc.60.1416084883019; Sat, 15 Nov 2014 12:54:43 -0800 (PST) Original-Received: by 10.27.215.135 with HTTP; Sat, 15 Nov 2014 12:54:42 -0800 (PST) In-Reply-To: X-Google-Sender-Auth: rsnLkwevLrluqaHZBk4t9rbvM4I X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c00::235 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:177252 Archived-At: --089e013d202a6c9db70507ebf41b Content-Type: text/plain; charset=UTF-8 Kelvin White wrote: > git-new-workdir is part of git/contrib which falls under the same GPL, correct? > If so, no harm in copying it for distribution AFAIK. Let me reword this more appropriately since it won't be distributed git-new-workdir is part of git/contrib which falls under the same GPL, correct? If so, no harm in copying it for our use AFAIK. > This does no good in feature branches, so you should always `bzr update' first > ...or in this case `git pull --rebase'. am I missing something here More clarification: I meant local branches are not upstream, and wont need updating --089e013d202a6c9db70507ebf41b Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable


Kelvin White <kwhite@gnu.org> wrote:
> git-new-workdir is part of git/contrib which falls under the= same GPL, correct?
>=C2=A0If so, no har= m in copying it for distribution AFAIK.
Let me reword this more appropriately sin= ce it won't be distributed

git-new-workdir is part= of git/contrib which falls under the same GPL, correct?
If so, no harm in copying it for our use AFAIK.

> This does= no good in feature branches, so you should always `bzr update' =C2=A0f= irst
> ...or in this case `git pull --rebase'. am I missin= g something here

More clarification: I meant local= branches are not upstream, and wont need updating
<= /div> --089e013d202a6c9db70507ebf41b--