From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 10.90.87.14 with SMTP id k14cs1187655agb; Tue, 29 Dec 2009 11:45:55 -0800 (PST) Received: by 10.224.34.230 with SMTP id m38mr8313883qad.284.1262115954506; Tue, 29 Dec 2009 11:45:54 -0800 (PST) Return-Path: Received: from rubyforge.org (rubyforge.org [205.234.109.19]) by mx.google.com with ESMTP id 5si19415189qyk.39.2009.12.29.11.45.54; Tue, 29 Dec 2009 11:45:54 -0800 (PST) Received-SPF: pass (google.com: domain of sup-devel-bounces@rubyforge.org designates 205.234.109.19 as permitted sender) client-ip=205.234.109.19; Authentication-Results: mx.google.com; spf=pass (google.com: domain of sup-devel-bounces@rubyforge.org designates 205.234.109.19 as permitted sender) smtp.mail=sup-devel-bounces@rubyforge.org Received: from rubyforge.org (rubyforge.org [127.0.0.1]) by rubyforge.org (Postfix) with ESMTP id 1E5DF15B802E; Tue, 29 Dec 2009 14:45:54 -0500 (EST) Received: from south-station-annex.mit.edu (SOUTH-STATION-ANNEX.MIT.EDU [18.72.1.2]) by rubyforge.org (Postfix) with ESMTP id 0C43715B802A for ; Tue, 29 Dec 2009 14:45:45 -0500 (EST) Received: from grand-central-station.mit.edu (GRAND-CENTRAL-STATION.MIT.EDU [18.7.21.82]) by south-station-annex.mit.edu (8.13.6/8.9.2) with ESMTP id nBTJjRrI007077; Tue, 29 Dec 2009 14:45:42 -0500 (EST) Received: from outgoing-legacy.mit.edu (OUTGOING-LEGACY.MIT.EDU [18.7.22.104]) by grand-central-station.mit.edu (8.13.6/8.9.2) with ESMTP id nBTJfs0f019971; Tue, 29 Dec 2009 14:41:55 -0500 (EST) Received: from localhost (EZYANG.MIT.EDU [18.243.1.50]) ) by outgoing-legacy.mit.edu (8.13.6/8.12.4) with ESMTP id nBTJfWgW013293; Tue, 29 Dec 2009 14:41:32 -0500 (EST) From: "Edward Z. Yang" To: Tero Tilus In-reply-to: <1262114695-sup-9446@tilus.net> References: <1262114695-sup-9446@tilus.net> Date: Tue, 29 Dec 2009 14:41:34 -0500 Message-Id: <1262115613-sup-1540@ezyang> User-Agent: Sup/git X-Scanned-By: MIMEDefang 2.42 X-Spam-Score: -2.599 X-Spam-Flag: NO Cc: sup-devel Subject: Re: [sup-devel] What's your workflow? X-BeenThere: sup-devel@rubyforge.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: Sup developer discussion List-Id: Sup developer discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: sup-devel-bounces@rubyforge.org Errors-To: sup-devel-bounces@rubyforge.org Excerpts from Tero Tilus's message of Tue Dec 29 14:34:33 -0500 2009: > I'm still a bit newbie with git. I'd like to hear how do you folks > develop/use sup. What's your workflow? Do you run master, next or > some own branch? If own, where do you fork and how do you track > upstream and your own patches? Detailed git commands appreciated. When I used to maintain a few patches on top of Git (I don't think I have any right now, since they became unnecessary when I switched to Xapian and OfflineImap), I'd have them on top of my local next branch; when pulling changes I'd: git fetch git rebase origin/next I used to run master, but switched to next on advice that it was fairly stable. Cheers, Edward _______________________________________________ Sup-devel mailing list Sup-devel@rubyforge.org http://rubyforge.org/mailman/listinfo/sup-devel