From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.devel Subject: Re: best workflow with git ? Date: Sat, 10 Jun 2017 18:23:26 +0300 Message-ID: <4ddaaf67-0a9e-136b-e63d-291301411c1d@yandex.ru> References: NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Trace: blaine.gmane.org 1497108227 23851 195.159.176.226 (10 Jun 2017 15:23:47 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sat, 10 Jun 2017 15:23:47 +0000 (UTC) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:54.0) Gecko/20100101 Thunderbird/54.0 To: Jean-Christophe Helary , emacs-devel Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Jun 10 17:23:44 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 1dJiEp-0005jz-Dd for ged-emacs-devel@m.gmane.org; Sat, 10 Jun 2017 17:23:43 +0200 Original-Received: from localhost ([::1]:58792 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dJiEq-0001Bs-3L for ged-emacs-devel@m.gmane.org; Sat, 10 Jun 2017 11:23:44 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:38440) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dJiEh-0001B7-Ap for emacs-devel@gnu.org; Sat, 10 Jun 2017 11:23:36 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dJiEe-0001Xm-8C for emacs-devel@gnu.org; Sat, 10 Jun 2017 11:23:35 -0400 Original-Received: from mail-wr0-x230.google.com ([2a00:1450:400c:c0c::230]:33542) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dJiEe-0001Wm-12 for emacs-devel@gnu.org; Sat, 10 Jun 2017 11:23:32 -0400 Original-Received: by mail-wr0-x230.google.com with SMTP id v104so57830416wrb.0 for ; Sat, 10 Jun 2017 08:23:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:to:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=Q6TR/G6BRgW00DxW6bHhr3Qp0rwJl8QMWrNgw1NVdQA=; b=Bj8KjT1VrOjejVb9pEJs/AxqhNmOrDT3D2kyIwQho7DlhBIuFEZrg7K/Rp0mCAP9eL ojA1ET43GwVKoyVngNWRaK8FpFIINSXfy3nbi8q4OUCJG+byIzWY68k2N6c3RezyZU8R +jYLSqIE4gaxyOM22kGJVyMaTeIu4RjQBzQH64Rb69alqgQwZ7wPGl0QetjS1kpRgxIp d+xFY/dOC1zH3E5hjDsERd91vl8ougP8mnTHM6/yi9M9xfn0Q6SlKSFQQm9wrBsZRnL6 XF+Y8Ca4mxk9+WeplZCGJLZL2T6CfNBHkc4duztVUXxRHxG9GtZb9PBnXBuMzbI2ZAT/ 3BbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:to:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=Q6TR/G6BRgW00DxW6bHhr3Qp0rwJl8QMWrNgw1NVdQA=; b=QiU+yOZtTdVnVfynnKbcJjOC1Pf/LHaQiiuq9cVTr7Z8eeS3qa4Y0oQL+koB5gmbyX hCQLr/9zcIwAvR7kwykm7ZugPLCpZu9HTjhJWClTqp2Gu7Z9OGZz/dLaM9IFC7icYdFb IAw62hM/WK8sbz8OCRwBhJru8nLm2E4BpCqMnc6BOFoo1JUYm0bahtTn/xncu2DEzoDp wECbpyAH4+Q2OZaOxq8xhBEYP0TI61aEZqzhRsmpO+qdiCEyNpHFOTJq80mrwepgBRdI E/gDnFtX8EC0uDITNvjn/XDls9/rhM1wpHE2xX8BXPje+6dakiPz5reXbAZLEq3EOENF m7Aw== X-Gm-Message-State: AODbwcALFj/7S1ttXJ3eP2YxQU+aqQei9k78tXExeU7ULmZP7GIyMhOZ bZtce4F1+y2Pv6PHLVk= X-Received: by 10.223.150.123 with SMTP id c56mr2284667wra.15.1497108209223; Sat, 10 Jun 2017 08:23:29 -0700 (PDT) Original-Received: from [192.168.1.3] ([185.105.174.193]) by smtp.googlemail.com with ESMTPSA id 63sm3372029wmt.9.2017.06.10.08.23.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 10 Jun 2017 08:23:28 -0700 (PDT) In-Reply-To: Content-Language: en-US X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::230 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:215562 Archived-At: On 6/10/17 6:04 PM, Jean-Christophe Helary wrote: > What should I do ? Create a branch where I do all my modifications ? And then do a git diff to create a patch that I send here ? When the patch has been applied, what should I do with the branch and the modified files ? If the changes are minor and not ready to commit, I usually do 'git stash save' and 'git stash pop' after the pull.