From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rene Herman Subject: "git pull . " versus "git merge " Date: Wed, 11 Jun 2008 02:51:00 +0200 Message-ID: <484F2174.9020508@keyaccess.nl> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit To: git X-From: git-owner@vger.kernel.org Wed Jun 11 02:52:18 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1K6EZQ-0004LZ-5m for gcvg-git-2@gmane.org; Wed, 11 Jun 2008 02:52:12 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754407AbYFKAu4 (ORCPT ); Tue, 10 Jun 2008 20:50:56 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754485AbYFKAu4 (ORCPT ); Tue, 10 Jun 2008 20:50:56 -0400 Received: from smtpq2.groni1.gr.home.nl ([213.51.130.201]:45367 "EHLO smtpq2.groni1.gr.home.nl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753565AbYFKAuz (ORCPT ); Tue, 10 Jun 2008 20:50:55 -0400 Received: from [213.51.130.189] (port=60654 helo=smtp2.groni1.gr.home.nl) by smtpq2.groni1.gr.home.nl with esmtp (Exim 4.60) (envelope-from ) id 1K6EYB-0007Ba-0f for git@vger.kernel.org; Wed, 11 Jun 2008 02:50:55 +0200 Received: from cc334381-b.groni1.gr.home.nl ([82.73.12.33]:48134 helo=[192.168.0.3]) by smtp2.groni1.gr.home.nl with esmtp (Exim 4.60) (envelope-from ) id 1K6EYA-0001N0-Tf for git@vger.kernel.org; Wed, 11 Jun 2008 02:50:55 +0200 User-Agent: Thunderbird 2.0.0.14 (X11/20080421) X-Spam-Score: -1.0 (-) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Good day. The manpages seem to be making somewhat of a point of mentioning "git pull . " as the way to merge a local branch into the current one but a simple "git merge " seems to work well. Is there a difference? Rene.