From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.176.0/21 X-Spam-Status: No, score=-3.5 required=3.0 tests=AWL,BAYES_00, DKIM_ADSP_CUSTOM_MED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MSGID_FROM_MTA_HEADER,RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 From: Jakub Narebski Subject: Re: Cleaning up git user-interface warts Date: Wed, 15 Nov 2006 11:09:13 +0100 Organization: At home Message-ID: References: <87k61yt1x2.wl%cworth@cworth.org> <455A1137.8030301@shadowen.org> <87hcx1u934.wl%cworth@cworth.org> <20061114194707.GH7201@pasky.or.cz> <87d57pu4qa.wl%cworth@cworth.org> <7v3b8lv9c9.fsf@assigned-by-dhcp.cox.net> <20061115040852.GL7201@pasky.or.cz> <7vd57ps51c.fsf@assigned-by-dhcp.cox.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7Bit NNTP-Posting-Date: Wed, 15 Nov 2006 10:10:20 +0000 (UTC) Return-path: Envelope-to: gcvg-git@gmane.org X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 32 Original-X-Complaints-To: usenet@sea.gmane.org X-Gmane-NNTP-Posting-Host: host-81-190-24-209.torun.mm.pl Mail-Copies-To: jnareb@gmail.com User-Agent: KNode/0.10.2 Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: Received: from vger.kernel.org ([209.132.176.167]) by ciao.gmane.org with esmtp (Exim 4.43) id 1GkHic-00075q-M6 for gcvg-git@gmane.org; Wed, 15 Nov 2006 11:10:11 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966744AbWKOKKG (ORCPT ); Wed, 15 Nov 2006 05:10:06 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S966729AbWKOKKG (ORCPT ); Wed, 15 Nov 2006 05:10:06 -0500 Received: from main.gmane.org ([80.91.229.2]:1172 "EHLO ciao.gmane.org") by vger.kernel.org with ESMTP id S966744AbWKOKKE (ORCPT ); Wed, 15 Nov 2006 05:10:04 -0500 Received: from root by ciao.gmane.org with local (Exim 4.43) id 1GkHiU-00073o-E0 for git@vger.kernel.org; Wed, 15 Nov 2006 11:10:02 +0100 Received: from host-81-190-24-209.torun.mm.pl ([81.190.24.209]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 15 Nov 2006 11:10:02 +0100 Received: from jnareb by host-81-190-24-209.torun.mm.pl with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 15 Nov 2006 11:10:02 +0100 To: git@vger.kernel.org Sender: git-owner@vger.kernel.org Nicolas Pitre wrote: > On Tue, 14 Nov 2006, Junio C Hamano wrote: > >> Yes. The current "merge" started its life as Linus's porcelain >> (we did not have fetch and pull infrastructure back then) but >> quickly has become just a helper for pull to produce a merge >> commit. If anybody thinks its UI is good as a general end-user >> level command, there is a need for "head examination". > > If you mean "git merge" it sure needs to be brought forward. It can't > be clearer than: > > git-merge the_other_branch > > or > > git-merge git://repo.com/time_machine.git > > to instantaneously understand what is going on. You mean git merge git://repo.com/time_machine.git#branch don't you (perhaps with 'master' as default branch)? -- Jakub Narebski Warsaw, Poland ShadeHawk on #git