How do I move a *change* (instead of a whole file) from one branch to another?

keybounceMBP:realisticfluids michael$ git diff stash^1 stash -- 
RealisticFluids.java
diff --git a/src/main/java/com/mcfht/realisticfluids/RealisticFluids.java 
b/src/main/java/com/mcfht/realisticfluids/RealisticFluids.java
index ca1bbb5..343bbeb 100644
--- a/src/main/java/com/mcfht/realisticfluids/RealisticFluids.java
+++ b/src/main/java/com/mcfht/realisticfluids/RealisticFluids.java
@@ -613,6 +613,7 @@ public class RealisticFluids extends DummyModContainer
                         // if (map.distant.size() < 256)
                         // System.out.println("Added eeet");
                         map.distant.add(c);
+                    map.chunks.remove(c);
                 }
             }
         }

There is a single patch in one file in that stash that needs to be promoted to 
develop. Everything else in that stash (so far) is debugging, one refactoring 
has happened (so the other stuff in the file won't even apply), and there would 
be a known merge conflict if I tried.

Now, this is an absolutely trivial item, and I can apply this line by hand.
But git should not be about doing this by hand. I figure there's a way to do 
this that I don't know.

---
Entertaining minecraft videos
http://YouTube.com/keybounce

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to