From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: ludo@gnu.org (Ludovic =?iso-8859-1?Q?Court=E8s?=) Newsgroups: gmane.lisp.guile.devel Subject: Git workflow overview Date: Thu, 27 Mar 2008 22:29:46 +0100 Message-ID: <87ej9vam9h.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1206653423 19620 80.91.229.12 (27 Mar 2008 21:30:23 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 27 Mar 2008 21:30:23 +0000 (UTC) To: guile-devel@gnu.org Original-X-From: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Thu Mar 27 22:30:54 2008 Return-path: Envelope-to: guile-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1JezgS-00059p-Nr for guile-devel@m.gmane.org; Thu, 27 Mar 2008 22:30:53 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Jezfr-00037k-0u for guile-devel@m.gmane.org; Thu, 27 Mar 2008 17:30:15 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Jezfl-00037N-S8 for guile-devel@gnu.org; Thu, 27 Mar 2008 17:30:09 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Jezfk-00036l-De for guile-devel@gnu.org; Thu, 27 Mar 2008 17:30:09 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Jezfk-00036h-5R for guile-devel@gnu.org; Thu, 27 Mar 2008 17:30:08 -0400 Original-Received: from main.gmane.org ([80.91.229.2] helo=ciao.gmane.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Jezfj-0004fd-6H for guile-devel@gnu.org; Thu, 27 Mar 2008 17:30:07 -0400 Original-Received: from list by ciao.gmane.org with local (Exim 4.43) id 1JezfZ-0004Tw-6Y for guile-devel@gnu.org; Thu, 27 Mar 2008 21:29:57 +0000 Original-Received: from reverse-83.fdn.fr ([80.67.176.83]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 27 Mar 2008 21:29:57 +0000 Original-Received: from ludo by reverse-83.fdn.fr with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 27 Mar 2008 21:29:57 +0000 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 52 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: reverse-83.fdn.fr X-Revolutionary-Date: 8 Germinal an 216 de la =?iso-8859-1?Q?R=E9volution?= X-PGP-Key-ID: 0xEB1F5364 X-PGP-Key: http://www.laas.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 821D 815D 902A 7EAB 5CEE D120 7FBA 3D4F EB1F 5364 X-OS: i686-pc-linux-gnu User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.1 (gnu/linux) Cancel-Lock: sha1:Fquot/xCGCFgdiqE5XfsnLUk+Qc= X-detected-kernel: by monty-python.gnu.org: Linux 2.6, seldom 2.4 (older, 4) X-BeenThere: guile-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Developers list for Guile, the GNU extensibility library" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Errors-To: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.lisp.guile.devel:7108 Archived-At: Hi, Just to clarify things, the following illustrates the typical Git workflow. First, we need to get a copy of the repository: $ git-clone ssh://SAVANNAH-ACCOUNT@git.sv.gnu.org/srv/git/guile.git $ cd guile Then, imagine we want to fix something both in HEAD and 1.8. We are currently in `master' (the equivalent of HEAD), and it is the only branch that we currently have: $ git-branch * master Eventually, we'll want to do things in the `branch_release-1-8' branch as well, so we need to create a local branch tracking the `branch_release-1-8' branch at Savannah: $ git-branch --track branch_release-1-8 origin/branch_release-1-8 Branch branch_release-1-8 set up to track remote branch refs/remotes/origin/branch_release-1-8. We now have the two branches: $ git-branch branch_release-1-8 * master We want to commit our fix to `master', then push it to the Savannah repo's `master' branch (after making sure that we are up-to-date), then to apply it to the 1.8 branch and push it: # hack the thing... $ git-commit -a -m "The fix." $ git-pull # Check whether we're up-to-date. $ git-push $ git-checkout branch_release-1-8 $ git-pull # Update. $ git-cherry-pick master # Apply the change we made in `master'. # fix any conflicts... $ git-push # Push the change to `branch_release-1-8'. That gives a rough overview of the thing. For larger changes, it will be better to use a separate branch locally, using `git-rebase' right before merging it, etc. There are surely good tutorials at http://git.or.cz/ . Enjoy! Ludo'.