From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: Git transition workflow Date: Wed, 13 Aug 2014 11:59:50 -0400 Message-ID: References: <2720487.3bKIskrhp0@descartes> <87sil214zs.fsf@drakenvlieg.flower> <87lhqtv7vf.fsf@Rainer.invalid> <87iolxhwep.fsf@uwakimon.sk.tsukuba.ac.jp> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1407945627 20313 80.91.229.3 (13 Aug 2014 16:00:27 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 13 Aug 2014 16:00:27 +0000 (UTC) Cc: emacs-devel@gnu.org To: Sergey Organov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Aug 13 18:00:19 2014 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 1XHayF-0005Vj-QM for ged-emacs-devel@m.gmane.org; Wed, 13 Aug 2014 18:00:15 +0200 Original-Received: from localhost ([::1]:48241 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XHayF-0005g3-G1 for ged-emacs-devel@m.gmane.org; Wed, 13 Aug 2014 12:00:15 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37202) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XHaxz-0005Oo-JY for emacs-devel@gnu.org; Wed, 13 Aug 2014 12:00:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XHaxr-00035I-Vc for emacs-devel@gnu.org; Wed, 13 Aug 2014 11:59:59 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:8352) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XHaxr-00035D-RX for emacs-devel@gnu.org; Wed, 13 Aug 2014 11:59:51 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ArUGAIDvNVPAqyKr/2dsb2JhbABZgwaDSsA9gRcXdIIlAQEBAQIBViMQCw4mEhQYDSSIBAjSGReOegeEOASrA4NMIYEsJA X-IPAS-Result: ArUGAIDvNVPAqyKr/2dsb2JhbABZgwaDSsA9gRcXdIIlAQEBAQIBViMQCw4mEhQYDSSIBAjSGReOegeEOASrA4NMIYEsJA X-IronPort-AV: E=Sophos;i="4.97,753,1389762000"; d="scan'208";a="86650570" Original-Received: from 192-171-34-171.cpe.pppoe.ca (HELO pastel.home) ([192.171.34.171]) by ironport2-out.teksavvy.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 13 Aug 2014 11:59:51 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id 064A262F89; Wed, 13 Aug 2014 11:59:50 -0400 (EDT) In-Reply-To: (Sergey Organov's message of "Wed, 13 Aug 2014 18:16:22 +0400") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.248.154.181 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:173629 Archived-At: >> There's one big difference here: in the merge case, all the state is >> directly visible in the files, > Not exactly, as staging area does have some hidden state. That's why you > need to "git add" a file after you resolve conflicts (unlike CVS). Right, but that's only metadata. In contrast in the rebase case, the hidden info can include actual textual changes you've made to the files (which have been temporarily removed, and will be (hopefully) reapplied after (some number of) "git rebase --continue"). Stefan