On Tue, Dec 15, 2015 at 1:19 PM, Barret Rhoden <[email protected]> wrote:
> On 2015-12-15 at 12:58 "'Davide Libenzi' via Akaros" > <[email protected]> wrote: > > Sorry, I applied that to the head of that file. > > Now it is kind of a mess to apply only those to an older commit, when > > the changes have been merged into that one. > > Do you have any recipe? > > Not a one liner. What I usually to split up a commit is this: > > $ git rebase -i some-commit-far-back-enough > > pick the commit you want to split. change it from "pick" to "edit". > take note of the commit hash (will need it later). > > git will stop there, then you can do whatever you want to that commit. > > at that point i do: > > $ git reset HEAD^ > > (pops off the commit.) > > $ git add -p > > (selectively add back in all of the things that should have been in > that original commit, but not the things you don't want) > > $ git commit -c HASH_FROM_THE_COMMIT_ORIGINALLY > > then add everything else from that commit to a WIP commit: > > $ git add -p > $ git commit -m WIP-fixing-whatever > > Then finish the git rebase: > $ git rebase --continue > > At this point, all that did was split up a commit into two commits. > You could do whatever you want during that 'edit' phase of the rebase, > including making more commits. > > Then you do another rebase -i, and move the WIP-fixing-whatever to the > right spot in the history. > > > If it turns out to be too much of a pain, then don't worry. But try to > catch it next time. =) > Please ☺ I know where I fscked up. I did a `git log --oneline CHANGED_FILE | head -n 1` to get the commit to splice the new changes in (as in, rebase-i-fixup), thinking that the branch only had one commit touching that file. Hopefully I will remember next time. > How? > > KERNEL_ELF_PATH can be defined in each arch's Makefile, which gets > included into the top-level Makefile. The existence of the -64b > version of the file is an x86 thing. At least for now. (It's created > by this: > > # Need to change the format to 32 bit, to trick multiboot/grub1 into > loading > ARCH_POST_LINK_CMD = cp $@ $@-64b; $(OBJCOPY) -I elf64-x86-64 -O > elf32-i386 $@ > Doing that in the build_info branch (#version stuff). -- You received this message because you are subscribed to the Google Groups "Akaros" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. For more options, visit https://groups.google.com/d/optout.
