From owner-freebsd-git@FreeBSD.ORG Mon Apr 27 19:08:50 2015 Return-Path: Delivered-To: freebsd-git@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9F190792; Mon, 27 Apr 2015 19:08:50 +0000 (UTC) Received: from mail-la0-x22c.google.com (mail-la0-x22c.google.com [IPv6:2a00:1450:4010:c03::22c]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3D9BB1E43; Mon, 27 Apr 2015 19:08:50 +0000 (UTC) Received: by lagv1 with SMTP id v1so87513308lag.3; Mon, 27 Apr 2015 12:08:48 -0700 (PDT) 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=z44bLbfxzj0ipWVPA9UtMl9TiquNQ88noBCVkzU5xKo=; b=uI7M/kfWDoB77+TSWpKIhmscBv4a2yKRyOmKEe08l6BY9K/qbnrKm98+lmSG5RkqvO RgO0nN1hgMs/k7zbcdKg0qqH7aS+hWV0IBZ3FGsHU7GrGpJNwfnOmAJZZqCs3Fuwvy+j /j2TB3DLlEUsoyQFp3j59KHNapZLupW2smmLtxkFKlkgqL/6TRT38jknZ9aeMZdKv8ec MpoEV6BGWnOqBKZL6bZXsPU8MRST/qWlr/3uOF5l65en6DOT4IySY9kH0cB5ZFRT5sdB ftFiU63UMLBXp607Db/WnmMA7XIKcv0SAbY5tIDoyQ0Rox1Ri+ZwdKKoJ8Umokk9NEYu tTFA== MIME-Version: 1.0 X-Received: by 10.113.10.134 with SMTP id ea6mr11226598lbd.29.1430161728311; Mon, 27 Apr 2015 12:08:48 -0700 (PDT) Sender: crodr001@gmail.com Received: by 10.112.164.38 with HTTP; Mon, 27 Apr 2015 12:08:48 -0700 (PDT) In-Reply-To: <553B01A4.1060309@freebsd.org> References: <553B01A4.1060309@freebsd.org> Date: Mon, 27 Apr 2015 12:08:48 -0700 X-Google-Sender-Auth: lj7_3RucoCNQDhdxNzvhBaV8F3Y Message-ID: Subject: Re: "git mv" and "svn mv" preserved with git-svn? From: Craig Rodrigues To: Alfred Perlstein Cc: freebsd-git@freebsd.org Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.20 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 27 Apr 2015 19:08:50 -0000 On Fri, Apr 24, 2015 at 7:53 PM, Alfred Perlstein wrote: > > > On 4/22/15 8:21 AM, Craig Rodrigues wrote: > >> Hi, >> >> I used git svn dcommit to commit this changeset: >> >> https://lists.freebsd.org/pipermail/svn-src-all/2015-April/102918.html >> >> I can confirm that "git mv" is preserved across "git svn dcommit", >> and the history of the moved files is preserved across the move. >> -- >> Craig >> >> Nice work Craig, any time to update the wiki to reflect that? > > I took a major pass through: https://wiki.freebsd.org/GitWorkflow to update and clean up the content. I moved the Git-Svn stuff to a separate sub-page of this doc to make it easier to read. Thanks for: (1) writing the doc (2) pushing this change back to git: https://github.com/git/git/commit/83c9433e679635f8fbf8961081ea3581c93ca778 -- Craig -- Craig > -Alfred > From owner-freebsd-git@FreeBSD.ORG Tue Apr 28 05:01:55 2015 Return-Path: Delivered-To: freebsd-git@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E1BAB9ED; Tue, 28 Apr 2015 05:01:55 +0000 (UTC) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.freebsd.org (Postfix) with ESMTP id CAF9111ED; Tue, 28 Apr 2015 05:01:55 +0000 (UTC) Received: from u10-2-32-011.office.norse-data.com (unknown [50.204.88.51]) by elvis.mu.org (Postfix) with ESMTPSA id 0EAD9341F868; Mon, 27 Apr 2015 22:01:48 -0700 (PDT) Message-ID: <553F1440.8080008@freebsd.org> Date: Mon, 27 Apr 2015 22:01:52 -0700 From: Alfred Perlstein Organization: FreeBSD User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 MIME-Version: 1.0 To: Craig Rodrigues CC: freebsd-git@freebsd.org Subject: Re: "git mv" and "svn mv" preserved with git-svn? References: <553B01A4.1060309@freebsd.org> In-Reply-To: Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Content-Filtered-By: Mailman/MimeDel 2.1.20 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.20 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: Tue, 28 Apr 2015 05:01:56 -0000 Thank you Craig, really nicely done! -Alfred On 4/27/15 12:08 PM, Craig Rodrigues wrote: > > > On Fri, Apr 24, 2015 at 7:53 PM, Alfred Perlstein > wrote: > > > > On 4/22/15 8:21 AM, Craig Rodrigues wrote: > > Hi, > > I used git svn dcommit to commit this changeset: > > https://lists.freebsd.org/pipermail/svn-src-all/2015-April/102918.html > > I can confirm that "git mv" is preserved across "git svn dcommit", > and the history of the moved files is preserved across the move. > -- > Craig > > Nice work Craig, any time to update the wiki to reflect that? > > > I took a major pass through: https://wiki.freebsd.org/GitWorkflow to > update and clean up the content. > I moved the Git-Svn stuff to a separate sub-page of this doc to make > it easier to read. > > Thanks for: > (1) writing the doc > (2) pushing this change back to git: > https://github.com/git/git/commit/83c9433e679635f8fbf8961081ea3581c93ca778 > > -- > Craig > > -- > Craig > > -Alfred > > From owner-freebsd-git@FreeBSD.ORG Fri May 1 16:15:17 2015 Return-Path: Delivered-To: freebsd-git@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1A4F3BD3 for ; Fri, 1 May 2015 16:15:17 +0000 (UTC) Received: from mail-lb0-x230.google.com (mail-lb0-x230.google.com [IPv6:2a00:1450:4010:c04::230]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9793F192E for ; Fri, 1 May 2015 16:15:16 +0000 (UTC) Received: by lbbzk7 with SMTP id zk7so67633524lbb.0 for ; Fri, 01 May 2015 09:15:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:date:message-id:subject:from:to:content-type; bh=b1/6MDEo1JWsZaWQKGBNHfo5k5/DZMkH9qZSc2DT18o=; b=I+Sw0Yb+BzEcQKFfgv9jauAMUUnD7zkN8wsBImxMDW2EAxpA4olF5UM3kvnzvaSXoD S1OAQL4qXvQMOHQVAsjbrzjO6F3U4GIbKtym03UoQCgco/Jkgcv8bX/ggdntZBETrpdG d4kX2Vm3HFajr+IDIMcCp2jdIrnFkwgYPQ2uPYzBXO/o1c77csFSi2goMXTEImrBOFOs pVdjaFOOT55fIZW85oezZj+z86h5ul8sENMWoBxDJH+z3odW0+oyiC66pWA6O7p0Scba gG6SKyBDUYQzZJ0VdF0M5MyU72qQDpD6Jltj5mNb9VmIVVwmR2uuwWyMG9+JmFbjuczz LK1A== MIME-Version: 1.0 X-Received: by 10.113.10.134 with SMTP id ea6mr8663145lbd.29.1430496913638; Fri, 01 May 2015 09:15:13 -0700 (PDT) Sender: crodr001@gmail.com Received: by 10.112.164.38 with HTTP; Fri, 1 May 2015 09:15:13 -0700 (PDT) Date: Fri, 1 May 2015 12:15:13 -0400 X-Google-Sender-Auth: Vz22XRplaUKWLW0S-vIDLtgeg4s Message-ID: Subject: Advanced Git talk at Pycon 2015 From: Craig Rodrigues To: freebsd-git@freebsd.org Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.20 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 01 May 2015 16:15:17 -0000 Hi, A talk, "Advanced Git" was given at Pycon 2015: SLIDES: https://speakerdeck.com/singingwolfboy/advanced-git VIDEO: http://pyvideo.org/video/3392/advanced-git There is nothing Python-specific about this talk. The talk is quite nice. It covers topics such as rebase, reflog, squashing commits, bisect. -- Craig