From: Sitaram Chamarty <sitaramc@gmail.com>
Date: Tue, 09 Jun 2009 00:46:20 GMT
Subject: Re: Merge into locally modified files?
Message-ID: <slrnh2rc6s.s8o.sitaramc@sitaramc.homelinux.net>
In-Reply-To: <2729632a0906081214q43e45ce7p812bd02f34934691@mail.gmail.com>

On 2009-06-08 19:14:38, skillzero@gmail.com <skillzero@gmail.com> wrote:

> Is this something that would be pretty easy to add to git pull (or I
> guess really to git merge since pull is just fetch+merge)? Maybe
> something like a 'git pull --rebase-local'? If I wanted to add

I'd just use an alias.  Either a bash alias like
    alias cvsup='git stash && git pull && git stash pop'
or a git alias like
    git config --global alias.cvsup '!git stash && git pull && git stash pop'

The latter is probably better aesthetically, and you'd call
it by saying "git cvsup".

Far cleaner than patching git-pull, no?