From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Alexis Newsgroups: gmane.emacs.devel Subject: Re: git is screwed Date: Thu, 26 Mar 2015 19:41:25 +1100 Message-ID: <87384srw0a.fsf@gmail.com> References: <20150322154147.GA6808@Tron.local> <20150323045209.GA71859@Tron.local> <550FE343.8010607@math.ntnu.no> <87zj707jca.fsf@bernoul.li> <874mp8rwmi.fsf@gmail.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; format=flowed X-Trace: ger.gmane.org 1427359307 29189 80.91.229.3 (26 Mar 2015 08:41:47 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 26 Mar 2015 08:41:47 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Mar 26 09:41:47 2015 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 1Yb3ME-0000Oq-Vn for ged-emacs-devel@m.gmane.org; Thu, 26 Mar 2015 09:41:43 +0100 Original-Received: from localhost ([::1]:43389 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yb3ME-0005hc-8J for ged-emacs-devel@m.gmane.org; Thu, 26 Mar 2015 04:41:42 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:40133) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yb3MB-0005fT-4M for emacs-devel@gnu.org; Thu, 26 Mar 2015 04:41:39 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yb3M4-0000Xe-MH for emacs-devel@gnu.org; Thu, 26 Mar 2015 04:41:39 -0400 Original-Received: from mail-pd0-x229.google.com ([2607:f8b0:400e:c02::229]:34330) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yb3M4-0000XX-EK for emacs-devel@gnu.org; Thu, 26 Mar 2015 04:41:32 -0400 Original-Received: by pdbni2 with SMTP id ni2so56189905pdb.1 for ; Thu, 26 Mar 2015 01:41:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=references:from:to:subject:in-reply-to:date:message-id:mime-version :content-type; bh=5ez1ERZl7P1A7gCdRlSIkWeYDgllh/rGdXHvLrcZZX8=; b=hAgEOIDIWdsXB8PILvliIduyC/o/3BM6/HoDfGq863pc5tq4Ou9tPYoLoTuOQKPcbr VfcTPkGaKGsj89D3mD3/2AzevIyUJKYbR2ahImNkSVUarsUQ0JJIofRPwQkidR79OqGc EPtML70uU0NxyecM9LQGQ/6G6nqZlmNBM9UqjjwDuOSpEQZl2dmr7y8KSNCDZ3+PgcCr bTk8NHOwQBK7NQwsVyqvHWHJRJV0YoiSOy3hbTtLi2bndjTA/F7YCA+HrfeDNGfSIj00 WEPTUNflu/R5UfUkIu9ZY4ACKz67w6a3ScpnDFTRiv7ABnwbPGc7nLym/Qqpgxexjz12 pBwg== X-Received: by 10.66.100.138 with SMTP id ey10mr24421244pab.142.1427359291253; Thu, 26 Mar 2015 01:41:31 -0700 (PDT) Original-Received: from localhost (ppp118-209-153-12.lns20.mel8.internode.on.net. [118.209.153.12]) by mx.google.com with ESMTPSA id rd7sm4793591pdb.85.2015.03.26.01.41.28 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 26 Mar 2015 01:41:30 -0700 (PDT) In-reply-to: <874mp8rwmi.fsf@gmail.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c02::229 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:184283 Archived-At: Alexis writes: > * go through multiple 'push stash -> delete unwanted -> pop > stash' cycles Er, sorry, that should be more like: push stash -> apply stash -> delete unwanted -> commit \ / -------------<------------------<------- Using magit means i don't think much about such workflows nowadays. :-) Alexis.