From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Ingo Lohmar Newsgroups: gmane.emacs.devel Subject: Re: best workflow with git ? Date: Sat, 10 Jun 2017 17:40:48 +0200 Message-ID: <87a85fn94v.fsf@acer.localhost.com> References: NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1497109262 26822 195.159.176.226 (10 Jun 2017 15:41:02 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sat, 10 Jun 2017 15:41:02 +0000 (UTC) To: Jean-Christophe Helary , emacs-devel Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Jun 10 17:40:58 2017 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dJiVV-0006h2-SJ for ged-emacs-devel@m.gmane.org; Sat, 10 Jun 2017 17:40:57 +0200 Original-Received: from localhost ([::1]:58827 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dJiVb-0004km-96 for ged-emacs-devel@m.gmane.org; Sat, 10 Jun 2017 11:41:03 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:40659) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dJiVT-0004kg-Jm for emacs-devel@gnu.org; Sat, 10 Jun 2017 11:40:56 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dJiVQ-0007ZQ-9L for emacs-devel@gnu.org; Sat, 10 Jun 2017 11:40:55 -0400 Original-Received: from mail-wr0-x235.google.com ([2a00:1450:400c:c0c::235]:36294) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dJiVP-0007Yv-TL for emacs-devel@gnu.org; Sat, 10 Jun 2017 11:40:52 -0400 Original-Received: by mail-wr0-x235.google.com with SMTP id v111so58272325wrc.3 for ; Sat, 10 Jun 2017 08:40:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:in-reply-to:references:date:message-id:mime-version; bh=tDNvVm1+OVhgO7ZTWPaibsim+0Jexkk7pxDBX9+Fghw=; b=kTNIV2Ai7edtEA5oE42yfhJSyOHm6VYaDVENoSCXseEBJgtw4Cjr6Q/iUfF+LEzqnU lCmJsPK/QhowT57VEgyAEScG0bTJ9TUEMnpKutIE9aZTlYy9TVcKHwMaeIFaHqD7ADuu uSdIQfBYP4D4egGRG9UQygWer3fJrwu/X02B4szyRY6qrae+2cwR0S6ByxueV7quTLGu axBgq8yVAC6+SmbKlJavM3NIpmRkO+Q62r/ytD7JUFOqbVgXtVC9h/zs0CR3nasOjfn5 H0CDqnd33wWFkyqgUM077xMtxJitKdLq+glHgu8XJMxAdPlP4a9KRkXEShCcFFoKLpPc bOrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:in-reply-to:references:date :message-id:mime-version; bh=tDNvVm1+OVhgO7ZTWPaibsim+0Jexkk7pxDBX9+Fghw=; b=k8MqEhx8Iftbu0Y2mcUB/Fih7ixVxNTT9ogGvr0k/0DnRhYorgAQaGMWP9dKLYmRqc ttu+iQigMRUA7leWNiut2CXB+Uhpek/TF6EmcqQ5kC414gAEIfnCJVQljfDIDJcBeL/8 l69Fe86UDbnjgE/noaMdoT+SDqN9mo6wD1gJ6LxYs/Sw7zFxQTV4hO5D+Fa6ra2Kooiy bYfPH5gMHZoBsbZoJ+nicpja9zh0MvtFLSpdO1RV6PUXLy1yVdLVzKCTkkYTdhLQji1k YEVvR2M8QMyDKesMttIFMf+qKzEpwM4DjuTdmENCcX/gO1e6e0CNWIvk/HQQej2Rd3KB Yh7A== X-Gm-Message-State: AODbwcB5bADb2qVHlgYQFYY1+oaasF217GdEkrdkEI1hyHJjwF3bWEDP Msem+55Tpynj0A== X-Received: by 10.80.159.33 with SMTP id b30mr31208181edf.5.1497109249160; Sat, 10 Jun 2017 08:40:49 -0700 (PDT) Original-Received: from localhost (xdsl-87-78-4-52.netcologne.de. [87.78.4.52]) by smtp.gmail.com with ESMTPSA id z31sm2296818edd.17.2017.06.10.08.40.48 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 10 Jun 2017 08:40:48 -0700 (PDT) In-Reply-To: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::235 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 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" Xref: news.gmane.org gmane.emacs.devel:215563 Archived-At: Hi Jean-Christophe, On Sun, Jun 11 2017 00:04 (+0900), Jean-Christophe Helary wrote: > I got the repository from Savannah and each time I want to update it I > do a "git pull origin master". If I have worked on some files before > that I usually get a message asking me to commit my files otherwise > they'd be overwritten. Since I'm not pushing anything to Savannah I > feel that committing to the local Master is useless and will only > create discrepancies between my repository and Savannah. if you only update to "have" the changes in your repository (not in your working tree), you could just substitute "pull" by "fetch" (try it -- no danger at all). If you are working on changes you plan to submit later, committing to your local master (or a branch, if you prefer) is perfectly fine. You can still add changes to such commits later, if you have not yet pushed them out. It can also help to change your point of view: After all, the "discrepancies" between your repository and Savannah are not a problem to avoid --- they are the essence of your work. :) Local commits are just a more powerful and flexible way to handle these changes (compared to changing files in your working tree). HTH, Ingo