Peter Krefting <peter <at> softwolves.pp.se> writes:
> If you edit the commit, you claim ownership of it. You should probably try
> using the -C option to commit, it should allow you to edit the message,
> while keeping the authorship and timestamp intact.
Thanks Peter, that works well. E.g.
% git rebase --continue
Finished one cherry-pick.
# Not currently on any branch.
nothing to commit (working directory clean)
Could not apply c33a375... Stop LNCC until OPC connection
% git commit --allow-empty -C c33a375
[detached HEAD e7d66f4] Stop LNCC until OPC connection
% git rebase --continue
....
So rebase can actually do what I want but my fundamental issue remains. I said
"pick" in the rebase for all of these commits but rebase is forcing me to do
each one manually! And it requires some rather arcane git magic that could only
be procured from a guru on a mailing list. :)
Surely something like an option --allow-empty on the rebase -i to skip over
these no-brainer picks is trivial to implement - and makes sense? As a simple
user, and knowing the original commits required --allow-empty, it was the first
option I went looking for on the rebase -i when I encountered this problem.
--
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