Ver código fonte

Fix order of commits in rebase todo file header

Change-Id: I0e41d89bbd4fc01ad3b3d05a45ee60af853bfae7
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
tags/v3.1.0.201310021548-r
Stefan Lay 10 anos atrás
pai
commit
c6aba99668

+ 2
- 2
org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java Ver arquivo

@@ -669,8 +669,8 @@ public class RebaseCommand extends GitCommand<RebaseResult> {
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();

Carregando…
Cancelar
Salvar