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: Re: Git workflow overview Date: Sat, 29 Mar 2008 12:31:36 +0100 Message-ID: <87ej9t4vhj.fsf@gnu.org> References: <87ej9vam9h.fsf@gnu.org> <871w5uqreg.fsf@ossau.uklinux.net> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1206790332 24084 80.91.229.12 (29 Mar 2008 11:32:12 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 29 Mar 2008 11:32:12 +0000 (UTC) To: guile-devel@gnu.org Original-X-From: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Sat Mar 29 12:32:42 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 1JfZId-0003bt-EJ for guile-devel@m.gmane.org; Sat, 29 Mar 2008 12:32:39 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JfZI1-0006oe-9c for guile-devel@m.gmane.org; Sat, 29 Mar 2008 07:32:01 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JfZHt-0006lN-9T for guile-devel@gnu.org; Sat, 29 Mar 2008 07:31:53 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JfZHr-0006kh-6A for guile-devel@gnu.org; Sat, 29 Mar 2008 07:31:52 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JfZHq-0006kb-Up for guile-devel@gnu.org; Sat, 29 Mar 2008 07:31:50 -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 1JfZHq-0007sm-Ij for guile-devel@gnu.org; Sat, 29 Mar 2008 07:31:50 -0400 Original-Received: from list by ciao.gmane.org with local (Exim 4.43) id 1JfZHk-000552-C3 for guile-devel@gnu.org; Sat, 29 Mar 2008 11:31:44 +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 ; Sat, 29 Mar 2008 11:31:44 +0000 Original-Received: from ludo by reverse-83.fdn.fr with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 29 Mar 2008 11:31:44 +0000 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 32 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: reverse-83.fdn.fr X-Revolutionary-Date: 10 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:lpx4viMG7qREPwSfNDTDiInjgus= 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:7118 Archived-At: Hi Neil, Neil Jerram writes: > Now, what am I doing wrong here? I've created a load of new > .gitignore files, and tried to push them to Savannah's master and > 1.8.x branches. The push to master looks good, but the push to 1.8.x > does nothing: I had similar troubles when using a local branch name different from `branch_release-1-8': somehow, Git doesn't memorize the branch name mapping for push. The easy fix, of course, it to name local branches like remote branches---which is what I did, because I was lazy. The "real" fix involves `.git/config' magic (or `.git/remotes', or `.git/branches'), to tell Git about the name of the remote branch where it should push. git-push(1) mentions several possibilities, but I haven't tried them. Alternatively, "git-push origin 1.8.x:branch_release-1-8" should work, but I haven't tried either. Maybe you could tell us which trick works best? :-) BTW, regarding `.gitignore', it's possible to use glob patterns, like "*.x", "*.doc", "*.lo", etc. Thanks, Ludo'.