From: | Donnie Berkholz <dberkholz@g.o> | ||
---|---|---|---|
To: | Caleb Cushing <xenoterracide@×××××.com> | ||
Cc: | "Robin H. Johnson" <robbat2@g.o>, gentoo-scm@l.g.o | ||
Subject: | Re: [gentoo-scm] Converting a recent CVS copy - Item 3: pushing, availability | ||
Date: | Fri, 17 Apr 2009 01:39:53 | ||
Message-Id: | 20090417013952.GB15629@comet | ||
In Reply to: | Re: [gentoo-scm] Converting a recent CVS copy - Item 3: pushing, availability by Caleb Cushing |
1 | On 05:03 Tue 14 Apr , Caleb Cushing wrote: |
2 | > On Tue, Apr 14, 2009 at 4:57 AM, Robin H. Johnson <robbat2@g.o> wrote: |
3 | > > Anybody wanting to pull and getting a failure due to non-fast-forwarding needs |
4 | > > to force it: |
5 | > |
6 | > don't pull, pull merges... rebase. |
7 | |
8 | For those of you less familiar with git, this is relevant when you've |
9 | made local commits that haven't been pushed yet. If you pull with no |
10 | options, you get these dumb merge entries in the history, but if you do |
11 | pull --rebase, it rebases your local commits onto HEAD without putting |
12 | the merge into history. |
13 | |
14 | -- |
15 | Thanks, |
16 | Donnie |
17 | |
18 | Donnie Berkholz |
19 | Developer, Gentoo Linux |
20 | Blog: http://dberkholz.wordpress.com |
Subject | Author |
---|---|
Re: [gentoo-scm] Converting a recent CVS copy - Item 3: pushing, availability | Nirbheek Chauhan <nirbheek.chauhan@×××××.com> |
Re: [gentoo-scm] Converting a recent CVS copy - Item 3: pushing, availability | Caleb Cushing <xenoterracide@×××××.com> |