From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: best workflow with git ? Date: Sat, 10 Jun 2017 20:11:38 +0300 Message-ID: <83vao36a45.fsf@gnu.org> References: Reply-To: Eli Zaretskii NNTP-Posting-Host: blaine.gmane.org X-Trace: blaine.gmane.org 1497114757 22437 195.159.176.226 (10 Jun 2017 17:12:37 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sat, 10 Jun 2017 17:12:37 +0000 (UTC) Cc: emacs-devel@gnu.org To: Jean-Christophe Helary Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Jun 10 19:12:32 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 1dJjw5-0005Mq-Qv for ged-emacs-devel@m.gmane.org; Sat, 10 Jun 2017 19:12:29 +0200 Original-Received: from localhost ([::1]:59201 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dJjwA-0002mT-W1 for ged-emacs-devel@m.gmane.org; Sat, 10 Jun 2017 13:12:35 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34889) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dJjvb-0002mM-NV for emacs-devel@gnu.org; Sat, 10 Jun 2017 13:12:00 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dJjvW-0004zB-RN for emacs-devel@gnu.org; Sat, 10 Jun 2017 13:11:59 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:34202) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dJjvW-0004z7-Nn; Sat, 10 Jun 2017 13:11:54 -0400 Original-Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:1191 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1dJjvV-0005Ag-W7; Sat, 10 Jun 2017 13:11:54 -0400 In-reply-to: (message from Jean-Christophe Helary on Sun, 11 Jun 2017 00:04:06 +0900) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e 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:215564 Archived-At: > From: Jean-Christophe Helary > Date: Sun, 11 Jun 2017 00:04:06 +0900 > > 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. > > What should I do ? Create a branch where I do all my modifications ? For a long-term development, yes. For short-term jobs, I' like Dmitry, use "git stash". (And in many cases "git pull" will not even ask for that, so I don't need to do anything.) > And then do a git diff to create a patch that I send here ? Yes. > When the patch has been applied, what should I do with the branch and the modified files ? You could delete the branch.