On Samstag, 26. Juni 2010, Madhu wrote: > Don't know if this has been resolved-by-debate here before, But adding > a file via git-add in the middle of an interactive rebase and aborting > the rebase deletes the hitherto untracked file. It should not. > > Maybe something like this to fix it? > > +++ b/git-rebase--interactive.sh > @@ -749,6 +749,7 @@ first and then run 'git rebase --continue' again." > git symbolic-ref HEAD $HEADNAME > ;; > esac && > + git-reset && > output git reset --hard $HEAD && > rm -rf "$DOTEST" > exit No, it can't be that simple. If rebase stopped due to a conflict on a commit that added new files, then your version of rebase --abort will leave these new files behind as untracked. -- Hannes -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html