[git-users] Re: Your branch is ahead of origin/master

2010-11-11 Thread Chris Johnsen
On Nov 10, 8:05 pm, David Doria wrote: > I don't understand what it means by > "Your branch is ahead of origin/master" It means that your current branch has commits that are not present in the origin/master remote-tracking branch. > Even if I do a > git reset --hard origin/master > git pull orig

[git-users] Re: Get tag date as the the last commit date as of tag

2010-05-26 Thread Chris Johnsen
> > Anyone have a good way to do likewise, but get the date of the last > > commit as of the tag, instead of the date the tag was created? On May 26, 10:49 am, Konstantin Khomoutov wrote: > I suspect it's as simple as using > $ git show 1.0.0^ > that is, referencing the first (and only) parent o

[git-users] Re: squashing

2010-05-02 Thread Chris Johnsen
On May 2, 7:24 pm, Charles Manning wrote: > If you're old enough you might remember VAX VMS. One really neat feature that > this had was file versioning that made it really easy to revert a few edits > back. > > I was trying to something like this in git storing each file after an edit > with > > $

[git-users] Re: Branching and directories

2010-03-04 Thread Chris Johnsen
On Mar 4, 7:36 am, vfclists wrote: > If still want to work in that way, would this method suffice? > > 1. Copy the files for that branch into a separate folder. > > 2. Do all the editing, testing and compiling in that folder > > 3. After finishing go back to the main repository directory and make

[git-users] Re: checking out files deleted from working tree

2010-03-04 Thread Chris Johnsen
On Mar 4, 8:12 am, Marcin Krol wrote: > git checkout master > > doesn't [[check out files deleted from working tree]] > > I can do: > > git checkout test.txt > > and the file reappears in working treee. But that requires specifying > files one by one; suppose there's a lot of them. Is there any wa

[git-users] Re: Defining a commit

2010-01-27 Thread Chris Johnsen
On Jan 25, 8:54 pm, Luisgo wrote: > How do you define a commit? I liked the short blog entry at . It says that a commit should be “one logical change” (similar to what others in this thread have written). It goes on to mention some thing

[git-users] Re: How to ignore files with leading '#'

2010-01-11 Thread Chris Johnsen
On Jan 8, 12:44 pm, Rick wrote: > I have a habit of prepending '#' to filenames that I wish to archive > or ignore. So myfile.txt becomes #myfile.txt . I found that I can > ignore these files  by placing "*/#" in the .gitignore file in my home > directory (or in the repository exclude file). BTW,