Raphael Hertzog <[EMAIL PROTECTED]> writes: > On Wed, 10 Oct 2007, Peter Karlsson wrote: >> Raphael Hertzog: >> >> > Please understand that this is not useful historical information and >> > as such we'd like to avoid seeing it. We want a single "Update Polish >> > translations" instead of 10 similar commits. >> >> Would doing the incremental updates on a branch and merging it with >> "git merge --squash" achieve the same effect, or would that still >> clutter the repository? > > I'm not sure I understand correctly the documentation of that option, but > it appears to be something completely unrelated. > > This command seems to apply the changes corresponding to the merge but not > record the merge as a merge, thus losing information concerning the > changes. It looks like this has the potential to hurt... please don't use > it. :)
Sorry but you missunderstood it. For example, say branches: master foo and I've been commiting on foo for a while. Once my change is done, I can go to master and run: git merge --squash foo. It'll basically do the merge but no commits. When you commit, it'll show all the commit log of previous commits and you can change it and use a nice commit message that will look like if everything has been done on a single commit. This is one way of using "topic branches" and is similar to the squash command on rebase -i. -- O T A V I O S A L V A D O R --------------------------------------------- E-mail: [EMAIL PROTECTED] UIN: 5906116 GNU/Linux User: 239058 GPG ID: 49A5F855 Home Page: http://otavio.ossystems.com.br --------------------------------------------- "Microsoft sells you Windows ... Linux gives you the whole house." -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]