From mboxrd@z Thu Jan 1 00:00:00 1970 From: Theodore Ts'o Subject: Re: [PATCH] Added guilt.reusebranch configuration option. Date: Wed, 22 May 2013 14:04:03 -0400 Message-ID: <20130522180403.GB20848@thunk.org> References: <1369224677-16404-1-git-send-email-tytso@mit.edu> <20130522134212.GB13731@poseidon.cudanet.local> <20130522144531.GB2777@thunk.org> <7v8v36kiau.fsf@alter.siamese.dyndns.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Josef 'Jeff' Sipek , Per Cederqvist , git@vger.kernel.org To: Junio C Hamano X-From: git-owner@vger.kernel.org Wed May 22 20:04:23 2013 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1UfDOe-0000J9-4c for gcvg-git-2@plane.gmane.org; Wed, 22 May 2013 20:04:20 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753259Ab3EVSEQ (ORCPT ); Wed, 22 May 2013 14:04:16 -0400 Received: from li9-11.members.linode.com ([67.18.176.11]:50847 "EHLO imap.thunk.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752792Ab3EVSEP (ORCPT ); Wed, 22 May 2013 14:04:15 -0400 Received: from root (helo=closure.thunk.org) by imap.thunk.org with local-esmtp (Exim 4.80) (envelope-from ) id 1UfDR5-0005WW-59; Wed, 22 May 2013 18:06:51 +0000 Received: by closure.thunk.org (Postfix, from userid 15806) id D4F595814B7; Wed, 22 May 2013 14:04:03 -0400 (EDT) Content-Disposition: inline In-Reply-To: <7v8v36kiau.fsf@alter.siamese.dyndns.org> User-Agent: Mutt/1.5.21 (2010-09-15) X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: tytso@thunk.org X-SA-Exim-Scanned: No (on imap.thunk.org); SAEximRunCond expanded to false Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: On Wed, May 22, 2013 at 10:58:49AM -0700, Junio C Hamano wrote: > Theodore Ts'o writes: > > > I was actually thinking that it might be interesting to have a > > branch..rewindable, which would change the guilt defaults, and > > could also key changes in key git behavior which makes it less likely > > that a user shoots him or herself in the foot --- i.e., give warnings > > if he or she has modified the branch in such a way that > > remotes.origin. is no longer contained within the branch head. > > At least "rebase" can pay attention to it and might make the world a > better place. Yeah, rebase was the primary command I was thinking about. The other one would be "git commit --amend" after the branch had been pushed out. - Ted