Andi Kleen <andi <at> firstfloor.org> writes:
>
> > $ git remote update
> > $ git reset --hard origin/master # when on master
> >
> > BTW. it is stated countless time in documentation that published
> > history should be not rebased, barring some extenuating circumstances
>
> Yes and people countless times ignore that recommendation and do
> it anyways (for good reasons). And then other users
> have to deal with these rebased trees somehow.
>
> Anyways it is all solvable but right now ill supported
> in standard commands and the documentation does not really
> cover it. I was just asking (mostly for others to avoid
> going through the same pain as me) for that to be improved
> so that git becomes easier to use.
>
> Sadly you guys don't even seem to want to recognize there
> is a problem
Why are you saying so?
You now understand that your script:
git fetch origin
git fetch --tags origin
git remote update
git checkout master
git reset --hard origin/master
it's far from being perfect, right?
git remote update is going to update all the remotes so you don't need the two
git fetch command.
Furthermore, I just tried what was suggested in this thread:
paolo@paolo-desktop:~/linux.trees.git$ git pull --rebase
remote: Counting objects: 7867, done.
remote: Compressing objects: 100% (1868/1868), done.
remote: Total 5125 (delta 4373), reused 3839 (delta 3246)
Receiving objects: 100% (5125/5125), 870.73 KiB | 187 KiB/s, done.
Resolving deltas: 100% (4373/4373), completed with 942 local objects.
>From git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
+ dff643a...f8fcb0d auto-core-next -> tip/auto-core-next (forced update)
b635ace..6a55617 auto-core-next-base -> tip/auto-core-next-base
b635ace..6a55617 auto-cpus4096-next -> tip/auto-cpus4096-next
b635ace..6a55617 auto-cpus4096-next-base -> tip/auto-cpus4096-next-base
+ 1f1fccc...696f6d1 auto-fastboot-next -> tip/auto-fastboot-next (forced update)
b635ace..6a55617 auto-fastboot-next-base -> tip/auto-fastboot-next-base
+ cdca408...06d0224 auto-ftrace-next -> tip/auto-ftrace-next (forced update)
b635ace..6a55617 auto-ftrace-next-base -> tip/auto-ftrace-next-base
b635ace..6a55617 auto-generic-ipi-next -> tip/auto-generic-ipi-next
[...]
A nice single command that seems to achive your needs.
Ciao,
Paolo
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
