Re: [git-users] Re: Merge and modification strategy

2012-09-26 Thread Max Hodges
Do you have any information of delegates and Git? I haven't come across that feature yet. Could be useful to OP. On Thu, Sep 27, 2012 at 3:20 AM, Gadget/Steve gadgetst...@hotmail.comwrote: On 26/09/2012 6:51 PM, Max Hodges wrote: Yes I don't disagree: that notion of locking a file makes

Re: [git-users] Re: Merge and modification strategy

2012-09-27 Thread Max Hodges
nice! I like the word Dictator for it. Seems like this is how Linus Torvalds has the Linux kernel Git setup--allows him take credit for work delegated to others by managing the commits! On Thu, Sep 27, 2012 at 4:51 AM, Gadget/Steve gadgetst...@hotmail.comwrote: On 26/09/2012 8:14 PM, Max

Re: [git-users] “Ghost” commit

2012-09-27 Thread Max Hodges
When you amend the second commit replaces the results of the first. It's for the occasion when you commit too early and possibly forget to add some files, or you mess up your commit message. On Thu, Sep 27, 2012 at 8:36 PM, Thiago Rossi thiagorossi...@gmail.comwrote: Hello everybody! I am new

Re: [git-users] “Ghost” commit

2012-09-27 Thread Max Hodges
the log might have a record of the amend, but the first commit has actually been replaced. If this is undesirable, then perhaps you should create a new commit rather than an amend. On Thu, Sep 27, 2012 at 8:59 PM, Max Hodges m...@whiterabbitpress.comwrote: When you amend the second commit

Re: [git-users] “Ghost” commit

2012-09-27 Thread Max Hodges
Hum, well it might be currently implemented in a way that leaves traces, but it seems amend is documented to replace the previous commit with the new one. Future implementations and garbage collection may vary. What's the purpose of trying to see if traces of this previous commit exist anyway?

Re: [git-users] “Ghost” commit

2012-09-27 Thread Max Hodges
defaults to '30 days' Search amend (587 hits in 95 files) if you want to dig in! :) On Thu, Sep 27, 2012 at 9:22 PM, Max Hodges m...@whiterabbitpress.comwrote: Hum, well it might be currently implemented in a way that leaves traces, but it seems amend is documented to replace the previous

Re: [git-users] “Ghost” commit

2012-09-27 Thread Max Hodges
Other types of dangling objects (blobs and trees) are also possible, and dangling objects can arise in other situations. On Thu, Sep 27, 2012 at 9:31 PM, Max Hodges m...@whiterabbitpress.comwrote: just peeked at the source files and noticed this text

Re: [git-users] Re: git mentor needed

2012-10-04 Thread Max Hodges
other (none distributed) systems are certainly easier to learn. We were fine with GIT for a few weeks, then suddenly our project is no longer working as expected. Hope we can sort it out with a bit of professional help. On Fri, Oct 5, 2012 at 2:45 AM, Konstantin Khomoutov

Re: [git-users] Is Git for me?

2012-10-08 Thread Max Hodges
repopulate it from a client and you have everything restored. I use git all the time even if the code does not leave one machine. It allows me to track changes and experiment and easily give my clients patches. On Sun, Oct 7, 2012 at 5:38 PM, Max Hodges m...@whiterabbitpress.com wrote: Git

Re: [git-users] Re: img attachment

2012-10-14 Thread Max Hodges
Hi Damien, I tried the first step but I get an error which I don't fully comprehend Max Hodges@DUCHESS /D/Documents/GIT-repos/wre-website (fixed-livevalidation) $ git checkout --track -b master remote/origin/master fatal: git checkout: updating paths is incompatible with switching branches. Did

Re: [git-users] Re: img attachment

2012-10-14 Thread Max Hodges
make sense. On Mon, Oct 15, 2012 at 11:04 AM, Max Hodges m...@whiterabbitpress.comwrote: Hi Damien, I tried the first step but I get an error which I don't fully comprehend Max Hodges@DUCHESS /D/Documents/GIT-repos/wre-website (fixed-livevalidation) $ git checkout --track -b master remote

Re: [git-users] Re: img attachment

2012-10-14 Thread Max Hodges
I think I found a way to sort it out. I deleted my local repo, then used the Clone function in SmartGit to start over Max Hodges@DUCHESS /D/Documents/GIT-repos/wre-website2 (master) $ git branch -a * master remotes/origin/#1-google-analytics-jquery-tracking remotes/origin/#4 remotes/origin

Re: [git-users] Re: Checkout a remote branch

2012-10-23 Thread Max Hodges
I think the best way to get more efficient with using Git is to simply start using a GUI. Then these operations are all just a matter of a few clicks. I use SmartGit myself. some others are listed here http://git-scm.com/downloads/guis On Oct 24, 2012, at 11:33, Gabriel Lau

Re: [git-users] Re: Checkout a remote branch

2012-10-24 Thread Max Hodges
a hacker or something ;) On Wed, Oct 24, 2012 at 8:45 PM, Konstantin Khomoutov flatw...@users.sourceforge.net wrote: On Wed, 24 Oct 2012 12:47:12 +0900 Max Hodges m...@whiterabbitpress.com wrote: I think the best way to get more efficient with using Git is to simply start using a GUI

Re: [git-users] Why do I have to be a source control engineer just to be a software developer?

2012-10-29 Thread Max Hodges
Hi Kramer, I know what you mean. I'm also an experienced, IT professional and findi Git to be very difficult and confusing to use. According the Linus Torvalds it used to be a much worse. He said it used to require quite a lot of brain power, but that other came along after him and make it cool

Re: [git-users] Help with repository on server

2012-10-30 Thread Max Hodges
merge commit locally then push to server, I think. On Oct 30, 2012, at 15:01, Cesar Casasola cesarsis...@gmail.com wrote: I finished to push my changes from clone repository to server repository but repository's files are outdated.

Re: [git-users] Help with repository on server

2012-10-30 Thread Max Hodges
repository (local repository). Then to push changes to remote repository (server repository). When a tema member clone the server repository get last changes committed but when view files are outdated...I don't know what happens... By the way the red text from the image that means? 2012/10/30 Max