* RFC: git pull or git rebase?
@ 2007-07-23 5:22 Michael S. Tsirkin
2007-07-23 9:07 ` Alex Riesen
0 siblings, 1 reply; 3+ messages in thread
From: Michael S. Tsirkin @ 2007-07-23 5:22 UTC (permalink / raw
To: Junio C Hamano; +Cc: git
Hi!
I'm working on several kernel-related projects at the same time:
- some of them are small, and private, so I do a fetch
and rebase to update to Linus' code, to keep history clean
- some of them are larger, and involve several other people,
so I do git pull (the history is messy anyway)
Problem is, I get confused sometimes and do a git pull
instead of git rebase, or vice versa. Of course I can just
reset to ORIG_HEAD when I realise my mistake.
However, I wonder whether this happens to others, too.
Would it make sense to add a branch attribute that says
"do not pull this branch" or "do not rebase this branch"?
Maybe even make git do the right thing automatically,
so that git would look at this attribute and perform
pull or rebase as appropriate?
Thanks,
--
MST
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: RFC: git pull or git rebase?
2007-07-23 5:22 RFC: git pull or git rebase? Michael S. Tsirkin
@ 2007-07-23 9:07 ` Alex Riesen
2007-07-23 9:31 ` Michael S. Tsirkin
0 siblings, 1 reply; 3+ messages in thread
From: Alex Riesen @ 2007-07-23 9:07 UTC (permalink / raw
To: Michael S. Tsirkin; +Cc: Junio C Hamano, git
On 7/23/07, Michael S. Tsirkin <mst@dev.mellanox.co.il> wrote:
> However, I wonder whether this happens to others, too.
> Would it make sense to add a branch attribute that says
> "do not pull this branch" or "do not rebase this branch"?
> Maybe even make git do the right thing automatically,
> so that git would look at this attribute and perform
> pull or rebase as appropriate?
If you have a recent enough git, it will refuse to pull into
a branch for which there is no configured remote branch.
Exactly for a reason like yours.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: RFC: git pull or git rebase?
2007-07-23 9:07 ` Alex Riesen
@ 2007-07-23 9:31 ` Michael S. Tsirkin
0 siblings, 0 replies; 3+ messages in thread
From: Michael S. Tsirkin @ 2007-07-23 9:31 UTC (permalink / raw
To: Alex Riesen; +Cc: Michael S. Tsirkin, Junio C Hamano, git
> Quoting Alex Riesen <raa.lkml@gmail.com>:
> Subject: Re: RFC: git pull or git rebase?
>
> On 7/23/07, Michael S. Tsirkin <mst@dev.mellanox.co.il> wrote:
> >However, I wonder whether this happens to others, too.
> >Would it make sense to add a branch attribute that says
> >"do not pull this branch" or "do not rebase this branch"?
> >Maybe even make git do the right thing automatically,
> >so that git would look at this attribute and perform
> >pull or rebase as appropriate?
>
> If you have a recent enough git, it will refuse to pull into
> a branch for which there is no configured remote branch.
> Exactly for a reason like yours.
Aha. I created the tree by git clone, so my master
is configured to merge from origin automatically.
--
MST
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-07-23 9:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-07-23 5:22 RFC: git pull or git rebase? Michael S. Tsirkin
2007-07-23 9:07 ` Alex Riesen
2007-07-23 9:31 ` Michael S. Tsirkin
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).