$ git log --graph --decorate --all * commit baf4612b2893ef4b1346ab76414ef982688d99eb (HEAD -> ex3) | Author: hseg | Date: Sun Jun 18 16:53:06 2017 +0300 | | Add solution to Q4b | * commit 8b0ff2a119ab64c0f79cb1da7973c623ceac469d | Author: hseg | Date: Sun Jun 18 16:52:59 2017 +0300 | | Add solution to Q4a | * commit a4f1e79d18b273d93ef62577a686e72f6e3f7460 | Author: hseg | Date: Sun Jun 18 16:52:46 2017 +0300 | | Add solution to Q3 | * commit ba45a6772752a661fb932c07313a0529b9fc015b | Author: hseg | Date: Sun Jun 18 16:51:24 2017 +0300 | | Add E3 questions | * commit ec530e46c3febe1a07427e0a894502f2a732ad2b | Author: hseg | Date: Sun Jun 18 15:45:47 2017 +0300 | | Add Foo's solutions to Q3, Q4 | * commit 775f87a11225bd0998960144c1f7887589063ab5 (tag: ex2-handed-in-v2, origin/master, origin/ex2, origin/HEAD, master, ex2) |\ Merge: 891fde2 9b2f939 | | Author: hseg | | Date: Mon Jun 5 06:38:06 2017 +0300 | | | | Correct Exercise 2 | | ...skipping... | | | * commit 26c75462b7c8c1532679d3aab9c361d680f000d5 | | Author: hseg | | Date: Sun May 28 17:05:16 2017 +0300 | | | | Update common to newest version | | | * commit a3fb5ecbcc3a5abff0bcc544d111723d815af4d2 | | Author: hseg | | Date: Sun May 28 17:04:59 2017 +0300 | | | | Add new dependencies: groups, probability, universal | | | * commit b0e856024bfdd37c932d55594466996a2ea14eda | | Author: hseg | | Date: Sat May 27 21:43:57 2017 +0300 | | | | Add current sketches | | * | commit ef6d41f08c76faa2b758235daf124dbb38fd0003 |/ Author: hseg | Date: Sun May 28 17:04:59 2017 +0300 | | Add new dependencies: groups, probability, universal | | (cherry picked from commit a3fb5ecbcc3a5abff0bcc544d111723d815af4d2) | * commit dac8c281ebba695c74b2af47816e807647e3ac3e Author: hseg Date: Sat May 27 21:43:16 2017 +0300 Add minimal latex libraries (algebra, common, sets) $ git rebase ec530e46c3febe1a07427e0a894502f2a732ad2b --onto ef6d41f08c76faa2b758235daf124dbb38fd0003 First, rewinding head to replay your work on top of it... Applying: Add E3 questions Using index info to reconstruct a base tree... M common Falling back to patching base and 3-way merge... warning: Failed to merge submodule common (commits don't follow merge-base) Auto-merging common CONFLICT (submodule): Merge conflict in common error: Failed to merge in the changes. Patch failed at 0001 Add E3 questions The copy of the patch that failed is found in: .git/rebase-apply/patch When you have resolved this problem, run "git rebase --continue". If you prefer to skip this patch, run "git rebase --skip" instead. To check out the original branch and stop rebasing, run "git rebase --abort". $ git add common/ $ git rebase --continue Applying: Add E3 questions Applying: Add solution to Q3 Applying: Add solution to Q4a Applying: Add solution to Q4b $ git log --graph --decorate --all * commit 3fbf0a413e13094fe52e3a99b0b283c6c2ac3c03 (HEAD -> ex3) | Author: hseg | Date: Sun Jun 18 16:53:06 2017 +0300 | | Add solution to Q4b | * commit a3e4ad3872ccc618a3970630c2815a9fab9f0d64 | Author: hseg | Date: Sun Jun 18 16:52:59 2017 +0300 | | Add solution to Q4a | * commit a6283d8d49d4a9b17d8fdf7a399dd919e9b297f7 | Author: hseg | Date: Sun Jun 18 16:52:46 2017 +0300 | | Add solution to Q3 | * commit 49350d065d8d0850fc3fc045a24c523f57eae64c | Author: hseg | Date: Sun Jun 18 16:51:24 2017 +0300 | | Add E3 questions | | * commit 775f87a11225bd0998960144c1f7887589063ab5 (tag: ex2-handed-in-v2, origin/master, origin/ex2, origin/HEAD, master, ex2) | |\ Merge: 891fde2 9b2f939 | | | Author: hseg | | | Date: Mon Jun 5 06:38:06 2017 +0300 | | | | | | Correct Exercise 2 | | | ...skipping... | | | * commit 26c75462b7c8c1532679d3aab9c361d680f000d5 | | Author: hseg | | Date: Sun May 28 17:05:16 2017 +0300 | | | | Update common to newest version | | | * commit a3fb5ecbcc3a5abff0bcc544d111723d815af4d2 | | Author: hseg | | Date: Sun May 28 17:04:59 2017 +0300 | | | | Add new dependencies: groups, probability, universal | | | * commit b0e856024bfdd37c932d55594466996a2ea14eda | | Author: hseg | | Date: Sat May 27 21:43:57 2017 +0300 | | | | Add current sketches | | * | commit ef6d41f08c76faa2b758235daf124dbb38fd0003 |/ Author: hseg | Date: Sun May 28 17:04:59 2017 +0300 | | Add new dependencies: groups, probability, universal | | (cherry picked from commit a3fb5ecbcc3a5abff0bcc544d111723d815af4d2) | * commit dac8c281ebba695c74b2af47816e807647e3ac3e Author: hseg Date: Sat May 27 21:43:16 2017 +0300 Add minimal latex libraries (algebra, common, sets) $ git tag clean ef6d41f08c76faa2b758235daf124dbb38fd0003 $ git show ec530e46c3febe1a07427e0a894502f2a732ad2b commit ec530e46c3febe1a07427e0a894502f2a732ad2b Author: hseg Date: Sun Jun 18 15:45:47 2017 +0300 Add Foo's solutions to Q3, Q4 diff --git a/sources/E3-Foo-V0.docx b/sources/E3-Foo-V0.docx new file mode 100644 index 0000000..5bc529d Binary files /dev/null and b/sources/E3-Foo-V0.docx differ $ git cherry-pick ec530e46c3febe1a07427e0a894502f2a732ad2b [ex3 3df71e5] Add Foo's solutions to Q3, Q4 Date: Sun Jun 18 15:45:47 2017 +0300 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 sources/E3-Foo-V0.docx $ git dag * commit 3df71e5c0932b7e3623d9ece37d2a5bdc0b97ea7 (HEAD -> ex3) | Author: Menachem Dov Mostowicz | Date: Sun Jun 18 15:45:47 2017 +0300 | | Add Foo's solutions to Q3, Q4 | * commit 3fbf0a413e13094fe52e3a99b0b283c6c2ac3c03 | Author: Menachem Dov Mostowicz | Date: Sun Jun 18 16:53:06 2017 +0300 | | Add solution to Q4b | * commit a3e4ad3872ccc618a3970630c2815a9fab9f0d64 | Author: Menachem Dov Mostowicz | Date: Sun Jun 18 16:52:59 2017 +0300 | | Add solution to Q4a | * commit a6283d8d49d4a9b17d8fdf7a399dd919e9b297f7 | Author: Menachem Dov Mostowicz | Date: Sun Jun 18 16:52:46 2017 +0300 | | Add solution to Q3 | * commit 49350d065d8d0850fc3fc045a24c523f57eae64c | Author: Menachem Dov Mostowicz | Date: Sun Jun 18 16:51:24 2017 +0300 | | Add E3 questions | $ git rebase -i clean # Reorder 3df71e5c0932b7e3623d9ece37d2a5bdc0b97ea7 under 49350d065d8d0850fc3fc045a24c523f57eae64c Successfully rebased and updated refs/heads/ex3.