Re: [git-users] trouble after 'git commit --amend': error with pull and push

2013-06-17 Thread tjolitz
Hello Konstantin, thank you very much for your long and informative answer! It helped me solve my problem in a minute and gave me a lot of new insights about the inner workings of git. Cheers Thorsten On Saturday, June 15, 2013 7:16:43 PM UTC+2, Konstantin Khomoutov wrote: > > On Sat, 15 Jun

Re: [git-users] trouble after 'git commit --amend': error with pull and push

2013-06-15 Thread Konstantin Khomoutov
On Sat, 15 Jun 2013 14:37:59 +0200 Thorsten Jolitz wrote: > I messed up a commit message, and wanted to fix it immediatly after > the commit (but I already merged the commit into master and pushed > both - master and work branch - to github, unfortunately). > > Thus I ran > > ,

[git-users] trouble after 'git commit --amend': error with pull and push

2013-06-15 Thread Thorsten Jolitz
Hi List, I messed up a commit message, and wanted to fix it immediatly after the commit (but I already merged the commit into master and pushed both - master and work branch - to github, unfortunately). Thus I ran ,--- | git commit --amend `--- edited the mess