[git-users] Re: glassware

2013-06-15 Thread Thomas Ferris Nicolaisen
On Saturday, June 15, 2013 6:41:34 AM UTC+2, Chris Vukin wrote: are there any developers interested in working with glassware? So, (a) what is glassware, and (b) what does it have to do with Git? -- You received this message because you are subscribed to the Google Groups Git for human

[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

Re: [git-users] Best way to identify a version of a repo

2013-06-15 Thread Konstantin Khomoutov
On Fri, 14 Jun 2013 17:00:59 -0500 Deanna Delapasse ddelapa...@gmail.com wrote: [...] One thing I forgot to mention, is that it's pretty easy to reset the work tree after a checkout to discard all local changes by either doing git reset --hard or git checkout -- . (the dot

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 tjol...@googlemail.com 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

Re: [git-users] Having trouble understanding how Git works?

2013-06-15 Thread Konstantin Khomoutov
On Thu, 13 Jun 2013 08:40:56 -0700 (PDT) vmhatup vmha...@gmail.com wrote: I'm trying to integrate some type of source code versioning. I come from a VSS background, where our workstations would connect to a server and 'check out' a solution/project into my workstation. Essentially, 'check

[git-users] git describe - strange results

2013-06-15 Thread Kevin Wilson
Hello, I am trying git describe --contains 21dc330157454046dd7c494961277d76e1c957fe and I get: v2.6.37-rc1~147^2~717 While the info it returns is correct (this patch was indeed for v2.6.37-rc1), I don't understand the suffix. What is ~147^2~717 ? any ideas? And it occurs with every sha I try.

Re: [git-users] git describe - strange results

2013-06-15 Thread Philip Oakley
From: Kevin Wilson wkev...@gmail.com Sent: Saturday, June 15, 2013 9:29 PM Hello, I am trying git describe --contains 21dc330157454046dd7c494961277d76e1c957fe and I get: v2.6.37-rc1~147^2~717 While the info it returns is correct (this patch was indeed for v2.6.37-rc1), I don't understand the