[00:17:12] <TimStarling>	 accidentally used git commit -a --amend instead of git add while merging a conflict during rebase
[00:17:45] <TimStarling>	 epic fail
[00:18:58] <TimStarling>	 my work ended up merged with a quite large merge commit which changed a lot of the same files
[00:19:09] <TimStarling>	 nothing for it but to start again
[00:26:30] <Krinkle>	 TimStarling: I've sometimes had success splitting it by using a combination of git reflog, git reset --hard <sha1 of accidental destination>, and git cherry-pick <sha1 of combined commit>, as a way to pull them apart again.
[00:27:19] <Krinkle>	 where after the cherry-pick you end up with a new commit that's only the difference between the two 
[00:27:32] <TimStarling>	 right, that probably would have worked
[00:28:05] <Krinkle>	 git will no-op the stuff that is redundant with the new-parent :) 
[00:28:25] <Krinkle>	 the inverse of this is that sometims you'll end up rebasing something on the wrong parent and end up with an empty commit