From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Jean-Christophe Helary Newsgroups: gmane.emacs.devel Subject: best workflow with git ? Date: Sun, 11 Jun 2017 00:04:06 +0900 Message-ID: NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 (Mac OS X Mail 10.3 \(3273\)) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable X-Trace: blaine.gmane.org 1497107062 24116 195.159.176.226 (10 Jun 2017 15:04:22 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sat, 10 Jun 2017 15:04:22 +0000 (UTC) To: emacs-devel Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Jun 10 17:04:18 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 1dJhw1-0005vF-JN for ged-emacs-devel@m.gmane.org; Sat, 10 Jun 2017 17:04:17 +0200 Original-Received: from localhost ([::1]:58755 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dJhw4-0004sf-Sj for ged-emacs-devel@m.gmane.org; Sat, 10 Jun 2017 11:04:20 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36378) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dJhvv-0004sP-Mf for emacs-devel@gnu.org; Sat, 10 Jun 2017 11:04:12 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dJhvs-0002ge-Kq for emacs-devel@gnu.org; Sat, 10 Jun 2017 11:04:11 -0400 Original-Received: from mail-pf0-x244.google.com ([2607:f8b0:400e:c00::244]:36205) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dJhvs-0002gV-F0 for emacs-devel@gnu.org; Sat, 10 Jun 2017 11:04:08 -0400 Original-Received: by mail-pf0-x244.google.com with SMTP id y7so11661398pfd.3 for ; Sat, 10 Jun 2017 08:04:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:content-transfer-encoding:mime-version:subject:message-id:date :to; bh=BCkovwk1Z75rnSqdg1nqrh0n2zIWPGxGRkSuy0G/FtM=; b=MXWIuQDBMXDnYm/MwygKeY2U05KzHKFH6o3hn1xrsrIJRMMNC01QF4bwhaLFrMXJV2 gZ6bwOqdhKafVOTwJkB/w8QU6wUf1ACdiZ1ZVymrykb9oHPrUZu5aOoVfw4eu0UcDmka GHwceK/Drka8WorMmHLIUMKnD+VF6V5jOMjHmh35lEvOM4g80NonVwwMAQKnpsoL540J 1OWbMKyGLJL49cg6H0TLKmhjCT/KJCJHECUMe5PkxG4SV/BSR+aM8/0otijSa172f+7J 5HHw96jl/k7HWpk0Zm6SJaY4nw5cIJR+f8Ao+1/oawwB4VEc1oGSO0EwEwlDWgfgc3Z7 BkrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:content-transfer-encoding:mime-version :subject:message-id:date:to; bh=BCkovwk1Z75rnSqdg1nqrh0n2zIWPGxGRkSuy0G/FtM=; b=ZQG3R/smXQWt8HpAu9BRprUVdfuEArBfB2zV6PeEJg+dJKiFZpp8IHQbM9+MEaXNSn 1jzFqM9tapzZH6DkjCNRB+QHMEXOd6fvN88RHOpRtANT16hpEzuyQU3FowbkujkRDpu4 mI7kLWCZdgN7yABgtWYVZR1YF0eBAEhFU9MTK1wmNwF0bNbSQPZdHqNJLbi/12lccNdo Bi8mhw6cupXWHZWr/m8VvWcrxSIERm/BpARp5QHKY95+NkT3rp1/HqUARwjvcO6jp0yx ybwh2addqkwFV1ygh4AIzwLADiJEgfX+yg6kLxyOPPYcNzz5jx7U/1I9x4Z4SNLo783D +W/A== X-Gm-Message-State: AODbwcAogavhLxaAwFa6UV7kcbKhx6e2T9r6QDMrrmpZE5Jfpy9/bw8G o2y3QhSLcTfFJ2gp8R0= X-Received: by 10.84.228.194 with SMTP id y2mr46562104pli.13.1497107047274; Sat, 10 Jun 2017 08:04:07 -0700 (PDT) Original-Received: from [192.168.24.55] (pl2587.ag0304.nttpc.ne.jp. [128.53.196.27]) by smtp.gmail.com with ESMTPSA id g27sm8235887pfd.80.2017.06.10.08.04.05 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 10 Jun 2017 08:04:06 -0700 (PDT) X-Mailer: Apple Mail (2.3273) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::244 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:215561 Archived-At: I'm not used to git and I see that I'm not doing the right thing = locally. I'd like to know the workflow that would work the best for what = I'm doing. 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 ? 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 ? It looks like there is something I'm not getting right and I'd like to = know what it is. Thank you in advance. Jean-Christophe=