Re: [git-users] Merge+rebase diverged branches

2014-08-04 Thread Gunnar Strand
-users@googlegroups.com *Sent:* Sunday, August 03, 2014 2:09 PM *Subject:* [git-users] Merge+rebase diverged branches Hello, I have two branches, master and table, both went through some changes and have their respective tracking brances: M1! - M2! - M3

Re: [git-users] Merge+rebase diverged branches

2014-08-04 Thread Gergely Polonkai
...@polonkai.eu *To:* git-users@googlegroups.com *Sent:* Sunday, August 03, 2014 2:09 PM *Subject:* [git-users] Merge+rebase diverged branches Hello, I have two branches, master and table, both went through some changes and have their respective tracking brances: M1! - M2! - M3! \ \-T1! - T2

[git-users] Merge+rebase diverged branches

2014-08-03 Thread Gergely Polonkai
Hello, I have two branches, master and table, both went through some changes and have their respective tracking brances: M1! - M2! - M3! \ \-T1! - T2! - T3 - T4 commits marked with ! are pushed upstream. I'd like to merge master into table, and rebase my local commits (T3 and T4) on top of

Re: [git-users] Merge+rebase diverged branches

2014-08-03 Thread Philip Oakley
From: Gergely Polonkai To: git-users@googlegroups.com Sent: Sunday, August 03, 2014 2:09 PM Subject: [git-users] Merge+rebase diverged branches Hello, I have two branches, master and table, both went through some changes and have their respective tracking brances: M1! - M2! - M3

Re: [git-users] Merge+rebase diverged branches

2014-08-03 Thread Gergely Polonkai
. On 3 Aug 2014 17:00, Philip Oakley philipoak...@iee.org wrote: *From:* Gergely Polonkai gerg...@polonkai.eu *To:* git-users@googlegroups.com *Sent:* Sunday, August 03, 2014 2:09 PM *Subject:* [git-users] Merge+rebase diverged branches Hello, I have two branches, master and table, both