... mbox". - If the branch being rebased is already a proper descendant of ... this is necessary. -- >8 -- [PATCH] rebase: one safety net, one bugfix ... C Hamano --- git-rebase.sh | 28 +++++++++++++++++++++++++++- 1 files changed, ...

git - Junio C Hamano - Nov 28 2005 - 17:02

... dealing with merges during a rebase just makes things more complicated ... parent of the merge being rebasable and one not. My original ... merge by > merging with your rebased branches again. In the above ... I wanted to make git-rebase just abort if there are ...

git - Andy Parkins - Feb 19 2007 - 06:48

... Jakub Narebski wrote: > > >> First, "stg rebase" when on some git branch ... HEAD [ branch ] > > And after "stg rebase" I want to have: > > > ..1 ... deck > (unapplied patches), because "git rebase" don't move them... unless ...

git - Yann Dirson - Jan 20 2007 - 16:07

... o---M'--Y' when you say "rebase --onto X a Y". However, ... , too. Even if you _could_ rebase them, you would rather not. And ... 'X', and would want to rebase the still-private part to ... merge by merging with your rebased branches again. In the above ...

git - Junio C Hamano - Feb 19 2007 - 05:36

... to $sha1 else + export _GIT_CHERRY_PICK_HELP="run 'git rebase --continue'" output git cherry-pick "$@" fi ... () { fi ;; *) + export _GIT_CHERRY_PICK_HELP="run 'git rebase --continue'" output git cherry-pick "$@" || ...

git - Wincent Colaiuta - Nov 26 2007 - 09:15

... wrote: >> >>> In using "git-rebase --interactive" to re-order commits you ... (misleading) noise, since when you rebase, once you solve the >> conflicts ... pick "$@" || + output git cherry-pick --rebasing "$@" || die_with_patch $sha1 "Could not pick ...

git - Wincent Colaiuta - Nov 26 2007 - 08:34

... writes: > Recently, rebasing has stopped working for me. ... IndexVector. > bash-3.00$ git rebase origin > > Applying 'espam::DecomposeChannels: actually ... like this: $ git branch before-rebase-precious ORIG_HEAD After this, if ...

git - Junio C Hamano - Nov 28 2005 - 16:19

... it would be great to just do: git pull --rebase --preserve-merges Or even better just `git pull` ... because we're not really doing an interactive rebase, we're just borrowing its more powerful rebase implementation, and repeat this each time a dev ...

git - Stephen Haberman - Sep 23 2008 - 14:29

... .com> writes: > I have found that rebase have (new) option : --merge > Looking at the ... Will the result be the same ? Regular "rebase" uses "format-patch" piped to "am ... there is no patch conflict. Since most rebases do not involve patch conflict for me ...

git - Junio C Hamano - Apr 11 2007 - 03:38

... > I find that the regular rebase without --merge is faster (at ... these two. When I was rebasing, some strange things happened (without ... of revisions that I was rebasing. I didn't mind much, ... 't care about speed of rebase, is it safe to permanently ...

git - Andy Parkins - Apr 11 2007 - 06:10

... do so. builtin-revert.c | 33 +++++++++++++++++++++++---------- git-rebase--interactive.sh | 5 +++++ 2 files changed, ... 'git add ', and +run 'git rebase --continue'" +export GIT_CHERRY_PICK_HELP + warn () { echo "$*" >&2 ...

git - Junio C Hamano - Nov 28 2007 - 04:06

... > when there's nothing to rebase (ie. upstream..branch is empty), ... fails to find any commits to rebase and correctly says "Nothing to ... E and E, so it rebases > _nothing_ onto F. Which means ... nice user-protection to make rebase abort when there's nothing ...

git - Björn - Feb 19 2008 - 08:52

... all for calling this command "stg rebase". > > > > After all, my current implementation as ... use a new command. > > > > However, "stg rebase " does not sound right. ... with "stg rebaseto " (or rebase-to) either. > > I think something ' ...

git - Yann Dirson - Jan 18 2007 - 15:42

... all you need is a 'rebase'-like command? Well, I realize ... to each other. One is rebasing to an arbitrary point; the ... would also call this command 'rebase' instead of > 'pull --to', even ... beginners. I'd rather say "rebase [] --to ", but it ...

git - Yann Dirson - Jan 18 2007 - 16:52

... m all for calling this command "stg rebase". > > After all, my current implementation as " ... use a new command. > > However, "stg rebase " does not sound right. I ... What do > others think ? First, "stg rebase" when on some git branch might ...

git - Jakub Narebski - Jan 19 2007 - 05:40

... , Jakub Narebski wrote: >> First, "stg rebase" when on some git branch might ... <-- HEAD [ branch ] And after "stg rebase" I want to have: ..1...2 ... deck (unapplied patches), because "git rebase" don't move them... unless ...

git - Jakub Narebski - Jan 20 2007 - 15:16

... classes around these two. > > When I was rebasing, some strange things happened (without any conflict ... , and in such situations merge based rebase is probably safer as it can take ... 's patch outside the context of rebasing. When we only have the patch ...

git - Junio C Hamano - Apr 12 2007 - 16:37

... 17. So the semantics of git-rebase just aren't quite what I ... in the given upstream branch, *then* rebases to the commit given after -- ... to do was just git-rebase v2.6.17 And rereading ... page, I see that git-rebase was working exactly as advertised. ...

git - J. Bruce Fields - Jun 29 2006 - 17:57

... repo. >> > Then I wanted to rebase my stack on that new ... for calling this command "stg rebase". Currently you can do >> "stg ... a; stg commit -a; git rebase; stg uncommit -n "... > > Or ... ve never seriously tried git rebase; does anyone have an > opinion ...

git - davidk - Jan 17 2007 - 07:07

... +0100, Jakub Narebski wrote: > First, "stg rebase" when on some git branch might mean ... to the target branch, which stack to rebase ? > Second, if you were to implement ... , which gets changed when the user rebases the stack. IOW, the conceptual base ...

git - Yann Dirson - Jan 20 2007 - 09:17