Hi, whenever I think that I have finally understood how merging and rebasing in git works, something happens and I am confused as before.
The git history (obtained with git log --graph --oneline --decorate --all) pasted below shows a git repository containing my ssh configuration, with a master branch that is shared between machines, and a local branch, fan, containing changes that are needed to use ssh on fan. Althouth both branches have diverged at the bottom of the history, the entire diff is tiny. 128 [4/4984]mh@fan:~ $ git diff master..fan | diffstat head/00_dist_defaults | 1 + mh/5_dist_swivel | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) [5/4985]mh@fan:~ $ But when I try to git rebase fan upon master, I get the same file that is even in the diff between msater and fan over and over again. I guess that git rebase goes back to commit 2357bcc where fan was branched off master and tries to reapply all changes one by one, most of which have been rolled back since then or have already been done in master. I have merged msater into fan multiple times in the hope that this would make rebasing possible again, but to no avail. * 193debd (HEAD -> master) customer Notebook is actually ln, not lv | * 24929ae (fan) Merge branch 'master' into fan | |\ | |/ |/| * | a58930f (origin/master) add tipsy * | f7e30b6 add fishtail * | 8b05270 add aliases for testsystems * | ac45ac3 testsid is no longer a ka51 host | * 808f3bc add dosido slide woodpecker | * 8e7e54a (origin/fan) fix wrong hostname lv/ln | * 62d92a2 Merge remote-tracking branch 'origin/master' into fan | |\ | |/ |/| | * 72cb5ec public key for reinitialized yubikey | * a1de811 add fleckerl | * ce9d9cc test: add keys to agent | * 6f8ec48 use swivel as swivel.ka51 to avoid RPF | | * 76d5279 (origin/customer) move whip to its own file, add git.z.d | | * 01efcb2 add ln00041 | | * df818d1 add swivel port forward for xrdp | | * 00045df customer systems are directly reachable from a customer system | |/ |/| * | 21196ca access ldaptest1 via milonga * | 7c2fe8f add oversway * | 6aaa649 add mh-yubikey01 * | 366c9d5 move whip to its own file, add git.z.d | | * 9949e2e (origin/atln) Merge branch 'master' into atln | | |\ | |_|/ |/| | * | | 32e85d7 add alemana |/ / * | 1010917 add temporary webvirt01 * | ca101af add gancho * | 9445368 allow 3des for access to hp switches | * 1bdaca1 add gancho | * a321479 add swivel port forward for xrdp | * 144fa67 customer systems are directly reachable from a customer system |/ * 2357bcc add code for *.customer.net (needs branch on customer machines) * 78f9a17 correctly bracket literal IPv6 address * 2b1c71e use ssh -W instead of nc How do I get back to a branch fan, that is clearly branched off master, which can be cleanly rebased up on master when master changes? Is there something easier than renaming fan to fan-old, branching a new fan off master and applying the output of git diff master..fan-old to the new fan? What did I do wrong to cause this mess in this simple repository? Greetings Marc -- ----------------------------------------------------------------------------- Marc Haber | "I don't trust Computers. They | Mailadresse im Header Leimen, Germany | lose things." Winona Ryder | Fon: *49 6224 1600402 Nordisch by Nature | How to make an American Quilt | Fax: *49 6224 1600421 -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
