> Hello. > > Is there a method to (dry?) run git-merge to detect conflicts > on: > > * current HEAD (or working tree) > * selected previous revision (the one used to "branch") > * directory tree (or a single file) "branched" with git-archive > > I'd like to synchronize portable working tree but don't want to keep > history in it. > > -- > Miłego dnia, > Łukasz Stelmach > -- Does "git-merge --squash" do what you want? You still need to have the other tree managed by git (even for a while). -- Daniel -- 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