[git-users] Re: GitMinutes - a podcast for Git users
AWESOME Podcast, Thomas!
I just started listening to all the episodes (during my 2-hour commute this
morning).
{I especially like your choice of music. Great Jazz}
Thom
On Monday, April 29, 2013 4:02:47 PM UTC-4, Thomas Ferris Nicolaisen wrote:
We've just rounded 6 episodes in the podcast, so I figured it's about time
to share it with those of you here who haven't heard it yet :)
http://www.gitminutes.com
Thanks for listening!
--
You received this message because you are subscribed to the Google Groups Git
for human beings group.
To unsubscribe from this group and stop receiving emails from it, send an email
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] GitMinutes - a podcast for Git users
On Mon, Apr 29, 2013 at 10:02 PM, Thomas Ferris Nicolaisen tfn...@gmail.com wrote: We've just rounded 6 episodes in the podcast, so I figured it's about time to share it with those of you here who haven't heard it yet :) http://www.gitminutes.com Thanks for listening! Very nice podcast indeed. Lots of food for thought relating to git (especially from the discussion on branching), and quite a few concrete pointers to stuff worth researching (bfg and subtrees are the most interesting ones for me). Please keep it up. /M -- Magnus Therning OpenPGP: 0xAB4DFBA4 email: mag...@therning.org jabber: mag...@therning.org twitter: magthe http://therning.org/magnus -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
[git-users] git filter-branch to move directory.... error rewriting
Hi, I'm new using GIT. Some weeks ago I moved 1 folder from my treefolder to another place using git filter-branch -f --tree-filter 'mv assets/www .' HEAD. Now I would like to move again another one, concretly git filter-branch -f --tree-filter 'mv www/app/resources www' HEAD. The problem now in that error in my repository: hgomis@ORD195 /C/Sencha/assets_backup (master) $ git filter-branch -f --tree-filter 'mv www/app/resources www' HEAD Rewrite d9ca94fdaf2c5f3945514581e91186b6b6460e38 (55/135)mv: cannot stat `www/ap p/resources': No such file or directory tree filter failed: mv www/app/resources www rm: cannot remove `c:/Sencha/assets_backup/.git-rewrite/revs': Permission denied rm: cannot remove directory `c:/Sencha/assets_backup/.git-rewrite': Directory no t empty Any suggestion please? It's very important for me!!! Thanks -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] git filter-branch to move directory.... error rewriting
On Tue, 7 May 2013 08:44:33 -0700 (PDT) Héctor Gomis hectorgo...@gmail.com wrote: I'm new using GIT. Some weeks ago I moved 1 folder from my treefolder to another place using git filter-branch -f --tree-filter 'mv assets/www .' HEAD. Now I would like to move again another one, concretly git filter-branch -f --tree-filter 'mv www/app/resources www' HEAD. The problem now in that error in my repository: hgomis@ORD195 /C/Sencha/assets_backup (master) $ git filter-branch -f --tree-filter 'mv www/app/resources www' HEAD Rewrite d9ca94fdaf2c5f3945514581e91186b6b6460e38 (55/135) mv: cannot stat `www/app/resources': No such file or directory ^^^ This is the problem: mv encounters a problem and returns a non-zero exit code which is detected by the `git filter-branch` machinery and makes the whole process fail (which is logical). mv is telling you there's no www/app/resources in the given commit (d9ca94 I suppose). The quick and dirty way to fix this is to append || true onto the end of that mv call which forces the exit code of the whole call to be 0. The slow and clean way is to first make sure the absense of that directory in that commit is okay, and employ the quick and dirty way only if that holds true. tree filter failed: mv www/app/resources www rm: cannot remove `c:/Sencha/assets_backup/.git-rewrite/revs': Permission denied rm: cannot remove directory `c:/Sencha/assets_backup/.git-rewrite': Directory not empty ^^^ These two are standard for Git for Windows. I dunno if this a known problem or not. -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] keeping #comments inside the commit message
I'm not wrong, I know git is behaving as it was specified to behave. I just think the other way would be better, and suggesting the specification could be changed. In which use cases there are comment lines mixed with the commit message? On Fri, May 3, 2013 at 3:20 PM, Konstantin Khomoutov flatw...@users.sourceforge.net wrote: On Fri, 3 May 2013 08:00:32 -0700 (PDT) bart9h rodolfo.bor...@gmail.com wrote: When you edit the commit message, it comes with a bunch of comments at the end of the file that will be removed automatically later. I thought it should remove just the consecutive lines starting with # at the end of the file, not lines starting with # inside the message, like: summary of the changes This is the longer explanation, and # this line here should not be removed. Am I wrong? As Dale pointed out, you're wrong. But it seems you could pass the --cleanup=whitespace command-line option to `git commit` to make it not touch the comment lines. You will have to manually remove them though. Or play with the commit.template configuration option. Or may be with a hook which is called to precompose the commit message (I can't recall its exact name at the moment). -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] need explanation diff /describe behavior
T On 05/05/2013 10:16 AM, Konstantin Khomoutov wrote: On Sun, May 05, 2013 at 09:09:30PM +0400, Konstantin Khomoutov wrote: [...] I cannot explain why you observe a whole-file difference in the first case. Two speculative guesses: Thanks, will be back with more questions most likely. -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] need explanation diff /describe behavior
On 05/05/2013 10:09 AM, Konstantin Khomoutov wrote: The call `git diff SDK_0.0 Makefile`, unless Makefile can be parsed as a revision, will compare the state of Makefile as recorded by a commit to which SDK_0.0 resolves with its state in the work tree. yes I see, and in fact it shows the whole Makefile which wasn't in SDK_0.0 after all. The call to `git describe` takes HEAD (as no explicit revision is passed to it), finds the nearest annotated tag down its ancestry line, succeeds and prints the result meaning the HEAD currently points to the commit 6a06923 which is the 34th commit since the SDK_0.0 tag. I see now. I was misusing it. I cannot explain why you observe a whole-file difference in the first case. Two speculative guesses: * The SDK_0.0 tag points to a commit which does not contain Makefile. yes, that was my mistake, but I couldn't see it. Using gitk its obvious. and thanks for the CLI commands in your follow-up. They will be useful. -- You received this message because you are subscribed to the Google Groups Git for human beings group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
