From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Michael Heerdegen Newsgroups: gmane.emacs.devel Subject: Re: Git question: when using branches, how does git treat working files when changing branches? Date: Thu, 29 Oct 2015 01:28:37 +0100 Message-ID: <877fm64ix6.fsf@web.de> References: <20151028192017.GC2538@acm.fritz.box> <87k2q6wy8p.fsf@linaro.org> <20151028223252.GD2538@acm.fritz.box> <87vb9qd2h4.fsf@wanadoo.es> <20151028235340.GE2538@acm.fritz.box> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1446078553 21753 80.91.229.3 (29 Oct 2015 00:29:13 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 29 Oct 2015 00:29:13 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Oct 29 01:29:02 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 1Zrb5R-00065j-SE for ged-emacs-devel@m.gmane.org; Thu, 29 Oct 2015 01:29:02 +0100 Original-Received: from localhost ([::1]:41281 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zrb5R-0007vh-F3 for ged-emacs-devel@m.gmane.org; Wed, 28 Oct 2015 20:29:01 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60227) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zrb5L-0007qX-Nb for emacs-devel@gnu.org; Wed, 28 Oct 2015 20:28:56 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zrb5H-0005je-NJ for emacs-devel@gnu.org; Wed, 28 Oct 2015 20:28:55 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:34910) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zrb5H-0005jG-Go for emacs-devel@gnu.org; Wed, 28 Oct 2015 20:28:51 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Zrb5F-0005xV-VT for emacs-devel@gnu.org; Thu, 29 Oct 2015 01:28:50 +0100 Original-Received: from ip-90-186-3-138.web.vodafone.de ([90.186.3.138]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 29 Oct 2015 01:28:49 +0100 Original-Received: from michael_heerdegen by ip-90-186-3-138.web.vodafone.de with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 29 Oct 2015 01:28:49 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 33 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: ip-90-186-3-138.web.vodafone.de User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) Cancel-Lock: sha1:k7gVv1PHnSHf1Js+BC0hRY6eMpY= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 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:192841 Archived-At: Alan Mackenzie writes: > Sometime, maybe. I too think it's worth the time (now). > Trouble is, it's all more stuff to learn, and it might not work well > for me. But maybe it would work very well for you. In the case of git, you have huge man pages that explain tons of options using terms that are defined nowhere; any command can do a variety of quite different things that one can hardly remember. With Magit, you don't need to remember git command options. You don't even have to remember lots of magit command names and key bindings, because most stuff is called via self-explanatory popups. So you would probably save much time in the midterm. Once you have used the (interactive) log where you can just hit RET on a commit and see the diff and the commit message, or used Ediff to stash, you'll never want to miss that. In the case of stashing: Just hit z z RET and you have a stash named "on [branch] [commit]" whose origin is obvious. Mmh, it's 1:28 now... Regards, Michael.