From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Yuri Khan Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Thu, 26 Mar 2015 01:03:13 +0600 Message-ID: References: <86egoeusg2.fsf@example.com> <83pp7yp5po.fsf@gnu.org> <86sicte9j3.fsf@example.com> <83y4mlnee2.fsf@gnu.org> <20150325181959.GC3833@acm.fritz.box> <83oangoqu5.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1427310234 7593 80.91.229.3 (25 Mar 2015 19:03:54 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 25 Mar 2015 19:03:54 +0000 (UTC) Cc: Alan Mackenzie , Stefan Monnier , Emacs developers To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Mar 25 20:03:53 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 1Yaqaj-00041r-VT for ged-emacs-devel@m.gmane.org; Wed, 25 Mar 2015 20:03:50 +0100 Original-Received: from localhost ([::1]:41003 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yaqaj-0004Cd-EA for ged-emacs-devel@m.gmane.org; Wed, 25 Mar 2015 15:03:49 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:53991) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YaqaW-0004CK-ER for emacs-devel@gnu.org; Wed, 25 Mar 2015 15:03:37 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YaqaV-0000mG-Jg for emacs-devel@gnu.org; Wed, 25 Mar 2015 15:03:36 -0400 Original-Received: from mail-ig0-x22a.google.com ([2607:f8b0:4001:c05::22a]:36815) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YaqaT-0000lb-SW; Wed, 25 Mar 2015 15:03:33 -0400 Original-Received: by igbud6 with SMTP id ud6so110262039igb.1; Wed, 25 Mar 2015 12:03:33 -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:from:date:message-id :subject:to:cc:content-type:content-transfer-encoding; bh=JfmmW197UAFQNkF0NOhlr650xhDMBa3RC46EbjApMdA=; b=NZvJQKei+rJo4PoaLjg/lG97w0aHAKddz3m7Yva38dos9/OHiML3jKQO/xyIL6Ti3r r2KONSrlJDAhBnf6oXhdxpKKo38pELW9odd9ujxFt0LqJ0x40NVYTz0eQ4EbmUOBTjBt XKCsDFWxv2mcZPhlHmQaM/QacaHwj7FY/0w7QScFSJT8/C9/OBgXHMRYAsMbh31mm/hi FfA6CKK8nVnHcMTvpS76P0YWc/cqOzHfkx9KZLzEypZTBC7J/p2DWRaR/yFtdRL7kOFv CePUgPRhgwJoUQ8i7Yg4w9brAxxD6f1p+9RgkRNlp6g2CkfC65odo8EsKdPlK39YOT7Q BlEg== X-Received: by 10.43.13.71 with SMTP id pl7mr34499377icb.31.1427310213451; Wed, 25 Mar 2015 12:03:33 -0700 (PDT) Original-Received: by 10.107.3.132 with HTTP; Wed, 25 Mar 2015 12:03:13 -0700 (PDT) In-Reply-To: <83oangoqu5.fsf@gnu.org> X-Google-Sender-Auth: BLs07-JVJt5s8yK-cYylC0pZQLg X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:4001:c05::22a 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:184258 Archived-At: On Thu, Mar 26, 2015 at 12:49 AM, Eli Zaretskii wrote: >> Without using the index, I=E2=80=99d have to make a conscious effort to = avoid >> mixing feature-related work with all those other good and useful >> modifications. Make notes on a piece of paper. Finish the feature >> work, commit, then go over the notes, do a few more commits. > > No, you can either: > > . start a new branch, and make all the unrelated changes there, or > > . stash your changes, make the unrelated changes, commit them, then > pop the stash and continue Both these methods can work, but they break the flow even more than making a note to get back to after committing. >> Bottom line: The index allows me to do several unrelated changes in >> the working copy, then separate them in two or more commits. > > There are other ways to do that without messing up your brain with the > index. By messing it up with other things.