Re: [PATCH] merge: default to @{upstream}

From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Jan 28, 2011, 17:53 UTC
Message-ID: <AANLkTikToBdcqPRx3Gu53r9vS6mwhoi1DS4GV63nOcxH@mail.gmail.com>
In-Reply-To: <1296233099.12855.14.camel@drew-northup.unet.maine.edu>

On Fri, Jan 28, 2011 at 6:44 PM, Drew Northup <drew.northup@maine.edu> wrote:

Show 6 quoted lines

> Honestly, I'd prefer that this NOT be merged in. When I mess up the
> command line I am typing I don't want some sort of hidden magic to kick
> in--I want it to tell me that I did something stupid by printing out the
> help message. This is standard to a large number of commands that by
> default expect a certain number of operands and I don't see any good
> reason why git merge should be any different.

git checkout (defaults to HEAD) git diff (defaults to HEAD) git fetch (defaults to origin) git format-patch (defaults to HEAD) git log (defaults to HEAD) git pull (defaults to origin) git show (defaults to HEAD)

How is this different from 'git pull'? If you are not sure about the 'git merge' command, then type 'git help merge' instead. Just like if you are not sure about the 'git pull' command. If you type any of these two, a merge would happen, and you can revert it easily with 'git reset --hard HEAD^'.

-- 
Felipe Contreras