Re: Merge into locally modified files?

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 2009-06-08 19:14:38, skillzero@xxxxxxxxx <skillzero@xxxxxxxxx> 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?


--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]