From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Lynbech Christian Newsgroups: gmane.emacs.devel Subject: Problem understanding git Date: Fri, 23 May 2008 13:54:05 +0200 Message-ID: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1211543688 2475 80.91.229.12 (23 May 2008 11:54:48 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 23 May 2008 11:54:48 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri May 23 13:55:24 2008 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1JzVrl-0003qB-Es for ged-emacs-devel@m.gmane.org; Fri, 23 May 2008 13:55:22 +0200 Original-Received: from localhost ([127.0.0.1]:35154 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JzVr0-0005Hy-3N for ged-emacs-devel@m.gmane.org; Fri, 23 May 2008 07:54:34 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JzVqv-0005Hd-FR for emacs-devel@gnu.org; Fri, 23 May 2008 07:54:29 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JzVqs-0005Gb-3c for emacs-devel@gnu.org; Fri, 23 May 2008 07:54:29 -0400 Original-Received: from [199.232.76.173] (port=52204 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JzVqr-0005GP-Ub for emacs-devel@gnu.org; Fri, 23 May 2008 07:54:25 -0400 Original-Received: from ws000774.tietoenator.com ([193.12.181.129]:20674) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1JzVqr-0006vU-FC for emacs-devel@gnu.org; Fri, 23 May 2008 07:54:25 -0400 X-AuditID: c10cb581-000006c4000004dc-97-4836b0583f86 Original-Received: from camaro.eu.tieto.com ([192.176.143.43]) by ws000774.tietoenator.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 23 May 2008 13:54:00 +0200 Original-Received: from ul000205.eu.tieto.com ([10.48.99.70]) by camaro.eu.tieto.com with Microsoft SMTPSVC(6.0.3790.1830); Fri, 23 May 2008 13:54:07 +0200 User-Agent: Gnus/5.110007 (No Gnus v0.7) Emacs/23.0.60 (gnu/linux) X-OriginalArrivalTime: 23 May 2008 11:54:07.0885 (UTC) FILETIME=[B4DD63D0:01C8BCCB] X-Brightmail-Tracker: AAAAAA== X-detected-kernel: by monty-python.gnu.org: Windows 2000 SP4, XP SP1+ X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:97579 Archived-At: Thanks to the good help from the list, I now have a git repository to track which will work with the company firewall. But I am having some problems in finding how to get git to do what I want. I have first cloned the repository from http://git.sv.gnu.org/r/emacs.git Now I want to update this, ie. do the equivalent of a "cvs update". On one machine, where I have git version 1.5.5.1, I just do a "git pull" and the updates comes pouring in, but when I try the same on my laptop where I only have git version 1.5.3.4, I get the following (to me) cryptic error message: You asked me to pull without telling me which branch you want to merge with, and 'branch.master.merge' in your configuration file does not tell me either. Please name which branch you want to merge on the command line and try again (e.g. 'git pull '). See git-pull(1) for details on the refspec. If you often merge with the same branch, you may want to configure the following variables in your configuration file: branch.master.remote = branch.master.merge = remote..url = remote..fetch = See git-config(1) for details. I have so far been unable to deduce how to get the slightly older git to do the update. Is there a kind soul out there who could help enlighten me? ------------------------+----------------------------------------------------- Christian Lynbech | christian #\@ defun #\. dk ------------------------+----------------------------------------------------- Hit the philistines three times over the head with the Elisp reference manual. - petonic@hal.com (Michael A. Petonic)