From c6aba99668eab76c1b05e021719f8ef9a69c3ae9 Mon Sep 17 00:00:00 2001 From: Stefan Lay Date: Fri, 27 Sep 2013 10:55:56 +0200 Subject: [PATCH] Fix order of commits in rebase todo file header Change-Id: I0e41d89bbd4fc01ad3b3d05a45ee60af853bfae7 Signed-off-by: Matthias Sohn --- org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java index 5a006792e1..a3f80c0f09 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java @@ -669,8 +669,8 @@ public class RebaseCommand extends GitCommand { BufferedWriter fw = new BufferedWriter(new OutputStreamWriter( new FileOutputStream(rebaseState.getFile(GIT_REBASE_TODO)), Constants.CHARACTER_ENCODING)); - fw.write("# Created by EGit: rebasing " + upstreamCommit.name() - + " onto " + headId.name()); + fw.write("# Created by EGit: rebasing " + headId.name() + " onto " + + upstreamCommit.name()); fw.newLine(); try { StringBuilder sb = new StringBuilder(); -- 2.39.5