From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Sam Gwydir Newsgroups: gmane.emacs.devel Subject: Re: git is screwed Date: Sun, 22 Mar 2015 23:52:09 -0500 Message-ID: <20150323045209.GA71859@Tron.local> References: <20150322154147.GA6808@Tron.local> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 X-Trace: ger.gmane.org 1427086365 17679 80.91.229.3 (23 Mar 2015 04:52:45 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 23 Mar 2015 04:52:45 +0000 (UTC) Cc: Andreas Schwab , emacs-devel@gnu.org To: Richard Stallman Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Mar 23 05:52:36 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 1YZuLn-0001ZN-61 for ged-emacs-devel@m.gmane.org; Mon, 23 Mar 2015 05:52:31 +0100 Original-Received: from localhost ([::1]:53626 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YZuLm-0001pm-BL for ged-emacs-devel@m.gmane.org; Mon, 23 Mar 2015 00:52:30 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34830) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YZuLa-0001ph-Ka for emacs-devel@gnu.org; Mon, 23 Mar 2015 00:52:19 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YZuLZ-0003Si-EQ for emacs-devel@gnu.org; Mon, 23 Mar 2015 00:52:18 -0400 Original-Received: from eru.samgwydir.com ([65.19.130.46]:7408 helo=samgwydir.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YZuLV-0003SU-Hp; Mon, 23 Mar 2015 00:52:13 -0400 Original-Received: from samgwydir.com (localhost [127.0.0.1]); by samgwydir.com (OpenSMTPD) with ESMTP id 8c846c46; Sun, 22 Mar 2015 21:52:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=samgwydir.com; h=date:from :to:cc:subject:message-id:references:mime-version:content-type :in-reply-to; s=personal; bh=DBEC1odBCvCO6DCXr5m94w8UsGI=; b=Qjg ap+3dZhGKzXHAeKFxbKnCE98N79Lw3lDDEdM9S+/Ow6y/1D7iywQRW9i/oVYXOfZ fEgBZWUcIHhG3PVSc/pZ9ahmtm5P7dISqWly0Jy64FzmugT3O5QLPnATKxLXKWQJ jIStXmtVbxdEjDKZ7lROyaBtdYHtc43Z8AkJ9crI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=samgwydir.com; h=date:from :to:cc:subject:message-id:references:mime-version:content-type :in-reply-to; q=dns; s=personal; b=H+n3aoDfizwwwQcdzOyW4zXerWcoe 3TM1vFjBhs4gPRHRHlhcEEEOEKxTdL4H5rZkmGz38b3z2s7E4RNwg3UroyrAlP05 FE12jrIKPfN1QR/1/JiP2rLfiQrtJs9y2Fw0VbU28nIYLAQQTa4ffpiguUbUXjNp Id4SOn8GFuBY5U= Original-Received: from localhost (Tron.local [74.196.127.225]); by samgwydir.com (OpenSMTPD) with ESMTPSA id dba8c4c8; TLS version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO; Sun, 22 Mar 2015 21:52:10 -0700 (PDT) Mail-Followup-To: Richard Stallman , Andreas Schwab , emacs-devel@gnu.org Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) X-detected-operating-system: by eggs.gnu.org: OpenBSD 4.x-5.x X-Received-From: 65.19.130.46 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:184135 Archived-At: -- Bringing us back to the mailing list. On 03/22, Richard Stallman wrote: > What OTHER effects does it have? I don't dare try it unless I know > it won't screw me some other way. As far as I know, none. 'git pull' is basically an alias for 'git fetch; git merge'. Many git users never use pull and always fetch separately for more control. The reason it puts you into an intermediate merge state is in order to not screw you. If you run 'git status' you can see the current state of your local branch. > What does "pushing" mean? Pushing merges your local branch with the remote branch (Savannah). 'svn commit' for git would be 'git commit && git push'. Take a look at this page[1] if you know svn, it lists the analogous commands. > I assumed that C-x v v was installing my changes. >From info: ...VC supports many common Git operations, but others, such as repository syncing, must be done from the command line. I don't use vc.el, but from some quick testing it appears it only commits. You have to push separately. Many people, myself included, use Magit[2] to interact with git through emacs. It will simplify your life. There is a package in MELPA if you are interested. Sam Gwydir. Footnotes: [1] https://git.wiki.kernel.org/index.php/GitSvnCrashCourse [2] https://github.com/magit/magit -- Sam Gwydir Texas A&M University +1 713 446 0367 sam@samgwydir.com