From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: dhruva Newsgroups: gmane.emacs.devel Subject: Re: Problem understanding git Date: Fri, 23 May 2008 17:48:36 +0530 Message-ID: References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1211545134 9196 80.91.229.12 (23 May 2008 12:18:54 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 23 May 2008 12:18:54 +0000 (UTC) Cc: emacs-devel@gnu.org To: "Lynbech Christian" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri May 23 14:19:33 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 1JzWFA-0004it-SP for ged-emacs-devel@m.gmane.org; Fri, 23 May 2008 14:19:33 +0200 Original-Received: from localhost ([127.0.0.1]:36591 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JzWEQ-0001Wv-3b for ged-emacs-devel@m.gmane.org; Fri, 23 May 2008 08:18:46 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JzWEL-0001WY-Ez for emacs-devel@gnu.org; Fri, 23 May 2008 08:18:41 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JzWEK-0001W3-0F for emacs-devel@gnu.org; Fri, 23 May 2008 08:18:41 -0400 Original-Received: from [199.232.76.173] (port=33461 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JzWEJ-0001Vz-Uk for emacs-devel@gnu.org; Fri, 23 May 2008 08:18:39 -0400 Original-Received: from ti-out-0910.google.com ([209.85.142.186]:61257) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1JzWEJ-0003Aj-Ga for emacs-devel@gnu.org; Fri, 23 May 2008 08:18:39 -0400 Original-Received: by ti-out-0910.google.com with SMTP id u5so1171211tia.10 for ; Fri, 23 May 2008 05:18:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; bh=PU7TdvQE4U1l4xRI12MshBAkLHnMJ/gqDFFZWlz/Y1Y=; b=JFRSUyM2vVRUDZCsp2H2+wju6dhN3OcGsPBC/jLLzMM+6fX7sMZfWJfcWdlBDP0fmBL09e82B+4kTwHhmTXTpMzWq3paF079y1GhErYtaVc+1q+4fBb+bW0znk4mEe9zuYahziqRuz6LjYmqiJ4Hv5tT7meMezYScaJztoYLzx0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=I3QtuWtYOechhOKX0bcTGieSk4HKk0tSHHx8ubDVD63Ck3won4yjaXiqWfjnTxD9DXYaS0O8uw58ZZNZhPq94P42vXhSJNY2pWeLwG4xUEFKrosfU4bwxpT8FKd9nqkgYX4bmdJEkIYLGwA1CPRb1e+nCzhz81uqXP1CR4vhvpg= Original-Received: by 10.110.70.5 with SMTP id s5mr170425tia.27.1211545116110; Fri, 23 May 2008 05:18:36 -0700 (PDT) Original-Received: by 10.110.90.17 with HTTP; Fri, 23 May 2008 05:18:36 -0700 (PDT) In-Reply-To: Content-Disposition: inline X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 2) 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:97580 Archived-At: Hi, On Fri, May 23, 2008 at 5:24 PM, Lynbech Christian wrote: > 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. > In the .git folder, there is a file 'config'. Ideally, it should have the following entry: [branch "master"] remote = origin merge = refs/heads/master - Type 'git branch' and you should see a branch named 'master'. - If you do see, type 'git checkout master' to explicitly switch to the master branch and do a git pull. - If you do not see the master branch, type 'git branch -a', you should see a bunch of 'origin/*' entries of which there will be 'origin/master'. - If you find 'origin/master', create a local master as 'git branch --track master origin/master' I get a feeling that you might have tried to checkout from a non local branch by doing 'git branch origin/master' or something unknowingly (i had done it once). Changing to local master by 'git checkout master' followed by a 'git pull' might work. -dky -- Contents reflect my personal views only!