From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 10.90.87.14 with SMTP id k14cs1197216agb; Tue, 29 Dec 2009 15:03:32 -0800 (PST) Received: by 10.224.27.16 with SMTP id g16mr8422653qac.103.1262127811960; Tue, 29 Dec 2009 15:03:31 -0800 (PST) Return-Path: Received: from rubyforge.org (rubyforge.org [205.234.109.19]) by mx.google.com with ESMTP id 32si19362436qyk.120.2009.12.29.15.03.31; Tue, 29 Dec 2009 15:03:31 -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 B3E261D78867; Tue, 29 Dec 2009 18:03:31 -0500 (EST) Received: from kuovi.tilus.net (kuovi.tilus.net [80.68.89.168]) by rubyforge.org (Postfix) with ESMTP id C138716782B6 for ; Tue, 29 Dec 2009 18:03:29 -0500 (EST) Received: by kuovi.tilus.net (Postfix, from userid 1000) id 577143FCCC; Wed, 30 Dec 2009 01:03:29 +0200 (EET) From: Tero Tilus To: sup-devel In-reply-to: <1262126992-sup-7312@masanjin.net> References: <1262114695-sup-9446@tilus.net> <1262116690-sup-8655@masanjin.net> <1262117270-sup-1009@tilus.net> <1262118240-sup-4202@ntdws12.chass.utoronto.ca> <1262123514-sup-7661@tilus.net> <1262126992-sup-7312@masanjin.net> Date: Wed, 30 Dec 2009 01:03:29 +0200 Message-Id: <1262127314-sup-3385@tilus.net> User-Agent: Sup/git 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 I think I gradually start to figure out how to get rid of habits I find messy. Thanks a ton already guys! Still one thing. Assume I have a feature-branch which is merged to my-daily-sup and I go --amend a commit in that feature-branch. How would I now get my-daily-sup up to date? (also assume that merge from feature-branch is not the tip of my-daily-sup so that git reset HEAD^ && git merge feature-branch is not a solution) -- Tero Tilus ## 050 3635 235 ## http://tero.tilus.net/ _______________________________________________ Sup-devel mailing list Sup-devel@rubyforge.org http://rubyforge.org/mailman/listinfo/sup-devel