Pushing into origin/master with a new change description

[Ivan Shapovalov]

On 5 августа 2012 10:42:27 Morten Volden wrote:
> Not quite sure if I broke something in the remote repo or not (I sincerely
> hope not), so just to make sure.
> 
> I took the changes made in my local development branch (for both
> kdevplatform and kdevelop ) and merged them into my local master.
> 
> Then did:
> 
> git push
> 
> Browsing the remote repository I see that there is no revision number to
> these changes and there is no change description.
> 
> What I really wanted was to have a single change description for all the
> small commits that was made in the development branch. I naively expected
> git to present me with the option to do this at some point in the process.
> 
> So the question is:
> 
> a) Is the remote repository broken?
> 
> b) Is there some way to fix the change description in the remote repo?
> 
> /Morten

Hello.
As far as I can understand, you wanted to summarize your edits using a merge 
commit with description, but Git didn't asked you to enter that description.
So,
a) The repo isn't broken. The default behavior of git merge is just not to 
create a "summarizing" merge commit when the merge is fast-forwarding (i. e. 
when your local branch's HEAD has master's HEAD in its ancestors). That was 
apparently true since you've merged master into your branch several times.

b) There is no way to "add" the summarizing commit now without redoing merge 
and force-pushing to master, but in future creation of that commit can be 
achieved by using "git merge --no-ff".

Hope I've correctly understood the issue.

--
Best regards,
Shapovalov Ivan