From mboxrd@z Thu Jan 1 00:00:00 1970 From: Junio C Hamano Subject: Re: "git pull REMOTE" question Date: Tue, 21 Aug 2007 21:35:59 -0700 Message-ID: <7vy7g4jids.fsf@gitster.siamese.dyndns.org> References: Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: git@vger.kernel.org To: "Miles Bader" X-From: git-owner@vger.kernel.org Wed Aug 22 06:36:22 2007 Return-path: Envelope-to: gcvg-git@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1INhx3-0006lb-0N for gcvg-git@gmane.org; Wed, 22 Aug 2007 06:36:17 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751520AbXHVEgO (ORCPT ); Wed, 22 Aug 2007 00:36:14 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751514AbXHVEgN (ORCPT ); Wed, 22 Aug 2007 00:36:13 -0400 Received: from rune.sasl.smtp.pobox.com ([208.210.124.37]:36861 "EHLO sasl.smtp.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751142AbXHVEgN (ORCPT ); Wed, 22 Aug 2007 00:36:13 -0400 Received: from pobox.com (ip68-225-240-77.oc.oc.cox.net [68.225.240.77]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by rune.sasl.smtp.pobox.com (Postfix) with ESMTP id 514C4124A2F; Wed, 22 Aug 2007 00:36:33 -0400 (EDT) In-Reply-To: (Miles Bader's message of "Wed, 22 Aug 2007 13:23:52 +0900") User-Agent: Gnus/5.110006 (No Gnus v0.6) Emacs/21.4 (gnu/linux) Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: "Miles Bader" writes: > Is there a way to set things up so that "git pull REMOTE" > automatically merges fetched branches when doing a non-default pull? The branch to be merged currently is determined per branch. You can just say "git pull usb master".