From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: "Stephen J. Turnbull" Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Sun, 05 Apr 2015 07:31:54 +0900 Message-ID: <87twwvfrtx.fsf@uwakimon.sk.tsukuba.ac.jp> References: <83twx2xoc8.fsf@gnu.org> <87619hke3u.fsf@uwakimon.sk.tsukuba.ac.jp> <551A3F17.6020903@math.ntnu.no> <20150331085055.GA2871@acm.fritz.box> <87zj6tiko1.fsf@uwakimon.sk.tsukuba.ac.jp> <20150331104935.GB2871@acm.fritz.box> <87y4mdi7tj.fsf@uwakimon.sk.tsukuba.ac.jp> <20150331214347.GH2871@acm.fritz.box> <20150401103225.GA2633@acm.fritz.box> <87h9t080gx.fsf@javad.com> <83384jsx3o.fsf@gnu.org> <83pp7nrfdn.fsf@gnu.org> <83a8yqr226.fsf@gnu.org> <831tk2qvz5.fsf@gnu.org> <87384ii26v.fsf@uwakimon.sk.tsukuba.ac.jp> <83wq1tptvp.fsf@gnu.org> <87pp7lhc9h.fsf@uwakimon.sk.tsukuba.ac.jp> <83sichpqe9.fsf@gnu.org> <87ioddglu6.fsf@uwakimon.sk.tsukuba.ac.jp> <83a8yoq56m.fsf@gnu.org> <87384ghm1a.fsf@uwakimon.sk.tsukuba.ac.jp> <837ftspcis.fsf@gnu.org> <551FA115.5090400@gmx.at> <834mowp7cj.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 X-Trace: ger.gmane.org 1428186740 32257 80.91.229.3 (4 Apr 2015 22:32:20 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 4 Apr 2015 22:32:20 +0000 (UTC) Cc: martin rudalics , sorganov@gmail.com, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 05 00:32:11 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 1YeWbq-0001bm-TU for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 00:32:11 +0200 Original-Received: from localhost ([::1]:34534 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeWbq-0006Qr-AV for ged-emacs-devel@m.gmane.org; Sat, 04 Apr 2015 18:32:10 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39258) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeWbn-0006Qm-G6 for emacs-devel@gnu.org; Sat, 04 Apr 2015 18:32:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YeWbm-0005al-MD for emacs-devel@gnu.org; Sat, 04 Apr 2015 18:32:07 -0400 Original-Received: from shako.sk.tsukuba.ac.jp ([130.158.97.161]:45586) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeWbf-0005YE-SU; Sat, 04 Apr 2015 18:32:00 -0400 Original-Received: from uwakimon.sk.tsukuba.ac.jp (uwakimon.sk.tsukuba.ac.jp [130.158.99.156]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by shako.sk.tsukuba.ac.jp (Postfix) with ESMTPS id EFC7B1C392D; Sun, 5 Apr 2015 07:31:54 +0900 (JST) Original-Received: by uwakimon.sk.tsukuba.ac.jp (Postfix, from userid 1000) id CC05A120EC9; Sun, 5 Apr 2015 07:31:54 +0900 (JST) In-Reply-To: <834mowp7cj.fsf@gnu.org> X-Mailer: VM undefined under 21.5 (beta34) "kale" 83e5c3cd6be6 XEmacs Lucid (x86_64-unknown-linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 130.158.97.161 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:184892 Archived-At: Eli Zaretskii writes: > > (1) Say that a pull is a fetch plus a merge and what these do. > > Why would that matter for people who just want to copy their mental > models from CVS to Git with minimal changes? I'm with Eli on this one; there's no need to explain, and people who encounter different workflows elsewhere are welcome to ask here. > > (3) Mention both stashing and rebasing. IMO it's no use ignoring them. > > People will find them in the manuals and tutorials and we should at > > least tell them why the method we propose here is sufficient or > > better. > > The fact that these are mentioned in the manuals is not a good > guidance for mentioning them, since the manuals mention a lot more > than just these two. I'm with Eli on this. Richard is a special case because of his need for long intervals between pulls, and his preference for leaving changes uncommitted for long intervals as well. I'm not really sure what to recommend for people who like to work that way. So stash isn't a real need in the base workflow IMO, but I'm not all that sure. Rebase is documented with warnings almost everywhere. Nobody should be surprised it's not in the base workflow. I am quite sure there's no need to mention it here.