Re: [git-users] git log format without times and/or zone

2013-09-03 Thread Thomas Ferris Nicolaisen
On Tuesday, September 3, 2013 7:46:47 PM UTC+2, Hans Ginzel wrote: > I get > > eef5296 Thu Aug 15 16:37:35 2013 +0200 msg3 > 1e68ecb Wed Aug 14 11:08:22 2013 +0200 msg2 > 4959e91 Mon Jul 29 12:03:09 2013 +0200 msg1 > > with my locale > > LANG=en_GB.UTF-8 > LC_ALL="en_GB.UTF-8" > > >> Append --dat

[git-users] Re: Need sine help on Git hooks

2013-09-03 Thread Thomas Ferris Nicolaisen
On Tuesday, September 3, 2013 10:34:38 PM UTC+2, Ling wrote: > Hello, > > I'm kinds of new on Git and now we are trying to get the hooks enabled > into one of our server repository, what we want this hooks doing is to > prevent when local users that push the changes from their local repo to >

[git-users] Re: Multiple clones of the same remote repo

2013-09-03 Thread Juha Aaltonen
Truckload of thanks for the explanation. It must have taken a lot of iron wire to bend it for me. :-) -- 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 g

Re: [git-users] avoid git deleting tags file

2013-09-03 Thread dexter ietf
On Tuesday, September 3, 2013 8:07:06 PM UTC+5:30, William Seiti Mizuta wrote: > Hi Dexter, > > you are using option x in git clean command. In the manual, the option x > tells: > > -x >Don’t use the standard ignore rules read from .gitignore (per > directory) and $GIT_DIR/info/

[git-users] Need sine help on Git hooks

2013-09-03 Thread Ling
Hello, I'm kinds of new on Git and now we are trying to get the hooks enabled into one of our server repository, what we want this hooks doing is to prevent when local users that push the changes from their local repo to server repo, we need to first check the commit comments to see if it inc

[git-users] Re: git hangs up unexpectedly (but git push works, kinda) dropbear+git

2013-09-03 Thread WD
I know this is from several years ago, but did you ever come up with a solution to this? I'm currently running into the same problem, using dropbearkey and git through Terminal IDE on an ASUS android tablet. The push works, but I get "The remote end hung up unexpectedly" and the post-receive ho

Re: [git-users] git log format without times and/or zone

2013-09-03 Thread Hans Ginzel
I get eef5296 Thu Aug 15 16:37:35 2013 +0200 msg3 1e68ecb Wed Aug 14 11:08:22 2013 +0200 msg2 4959e91 Mon Jul 29 12:03:09 2013 +0200 msg1 with my locale LANG=en_GB.UTF-8 LC_ALL="en_GB.UTF-8" Dne úterý, 3. září 2013 17:30:09 UTC+2 John McKown napsal(a): > > See if: > > git log --format="%h %cd %

Re: [git-users] starting out with git -- a problem with branching....

2013-09-03 Thread David
On 4 September 2013 01:20, John McKown wrote: > If you don't want to do a commit, then do a stash. It puts the current > working directory "off to the side". Like a temporary branch. When you want > to come back, then you do a git stash pop. > > I think I understand how you're working. You likely

Re: [git-users] starting out with git -- a problem with branching....

2013-09-03 Thread John McKown
For milestones, I either create a new branch at that commit point (rarely) or tag the commit with a nice name. On Tue, Sep 3, 2013 at 10:40 AM, David wrote: > On 4 September 2013 01:20, John McKown > wrote: > > If you don't want to do a commit, then do a stash. It puts the current > > working

Re: [git-users] starting out with git -- a problem with branching....

2013-09-03 Thread Konstantin Khomoutov
On Tue, 3 Sep 2013 08:05:23 -0700 (PDT) maya melnick wrote: [...] > but I imagine in other situations, to have to commit every time > before switching branches is weird... what if you haven't finished > work on a branch and need to switch branches to take care of another > problem, but don't want

Re: [git-users] starting out with git -- a problem with branching....

2013-09-03 Thread Konstantin Khomoutov
On Tue, 3 Sep 2013 10:20:06 -0500 John McKown wrote: > If you don't want to do a commit, then do a stash. It puts the current > working directory "off to the side". Like a temporary branch. This comparison is quite to the point -- the `git stash` command even allows to create a new branch from a

Re: [git-users] git log format without times and/or zone

2013-09-03 Thread John McKown
See if: git log --format="%h %cd %s" gives you what you want. It looks like you last example, with only the date. On Tue, Sep 3, 2013 at 10:20 AM, Hans Ginzel wrote: > Hello! > > I get with git log --format="%h %ci %s" > > eef5296 2013-08-15 16:37:35 +0200 msg3 > 1e68ecb 2013-08-14 11:08:22

Re: [git-users] starting out with git -- a problem with branching....

2013-09-03 Thread Dale R. Worley
> From: maya melnick > > (I haven't commited, it's just a test branch, I don't want to commit;-) > make sense? The way to think about it is that you've just changed a file in the working directory, it isn't *in* the branch or the repository. So when you tell Git to shuffle the working dir

Re: [git-users] starting out with git -- a problem with branching....

2013-09-03 Thread Paul Smith
On Tue, 2013-09-03 at 08:05 -0700, maya melnick wrote: > but I imagine in other situations, to have to commit every time before > switching branches is weird... what if you haven't finished work on a > branch and need to switch branches to take care of another problem, > but don't want to commit wh

Re: [git-users] How to delete files from repository

2013-09-03 Thread Quentin Silvestre
yes thanks a lot !!! and so fast and easy... ! Le mardi 3 septembre 2013 12:03:30 UTC+2, Konstantin Khomoutov a écrit : > > On Tue, 3 Sep 2013 02:30:36 -0700 (PDT) > Quentin Silvestre > wrote: > > > I have a repository with a remote repository. > > My colleague had the very bad idea to put 4 pr

[git-users] git log format without times and/or zone

2013-09-03 Thread Hans Ginzel
Hello! I get with git log --format="%h %ci %s" eef5296 2013-08-15 16:37:35 +0200 msg3 1e68ecb 2013-08-14 11:08:22 +0200 msg2 4959e91 2013-07-29 12:03:09 +0200 msg1 How can I achieve this output please? eef5296 2013-08-15 16:37 msg3 1e68ecb 2013-08-14 11:08 msg2 4959e91 2013-07-29 12:03 msg1 Or

Re: [git-users] starting out with git -- a problem with branching....

2013-09-03 Thread John McKown
If you don't want to do a commit, then do a stash. It puts the current working directory "off to the side". Like a temporary branch. When you want to come back, then you do a git stash pop. I think I understand how you're working. You likely only do a "commit" when you think something is "finished

Re: [git-users] starting out with git -- a problem with branching....

2013-09-03 Thread maya melnick
thank you all very much for your responses this is the first time I'm back on Usenet in a long time... it had become practically unusable b/c of the spam, but I see that google got its act together here, and has somehow managed to deal with the spam...;-) this is good to know... yes, I s

Re: [git-users] avoid git deleting tags file

2013-09-03 Thread William Seiti Mizuta
Hi Dexter, you are using option x in git clean command. In the manual, the option x tells: -x Don’t use the standard ignore rules read from .gitignore (per directory) and $GIT_DIR/info/exclude, but do still use the ignore rules given with -e options. This allows removing all untrac

[git-users] avoid git deleting tags file

2013-09-03 Thread dexter ietf
hi, when i run git clean -xfd, git deletes my tags file. i have the tag file listed in gitignore, but how do i tell git not to remove the tags file. -dexter -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group

Re: [git-users] starting out with git -- a problem with branching....

2013-09-03 Thread Konstantin Khomoutov
On Tue, 3 Sep 2013 06:44:34 -0700 (PDT) maya melnick wrote: [...] > but in my case when I switch back to branch master the changes I made > in branch 'test' do not get reverted I look in the dir and the > one file I added in branch 'test' is still there when I have switched > to branch 'mast

Re: [git-users] starting out with git -- a problem with branching....

2013-09-03 Thread David
On 3 September 2013 23:44, maya melnick wrote: > > but in my case when I switch back to branch master the changes I made in > branch 'test' do not get reverted I look in the dir and the one file I > added in branch 'test' is still there when I have switched to branch > 'master'... > > (I have

[git-users] Re: starting out with git -- a problem with branching....

2013-09-03 Thread Alex Lewis
If you don't commit the changes Git won't do anything to them when you change branches, I.e. they'll still be there but this time on top of master. As you don't want to commit the changes you'll need to "stash" them instead to get to a clean state. A checkout of master should then get what you

Re: [git-users] starting out with git -- a problem with branching....

2013-09-03 Thread Gergely Polonkai
Check back this list's history. There was an identical problem a few days ago. On 3 Sep 2013 15:44, "maya melnick" wrote: > > > > hi, > > I'm just starting out with Git... I have a little issue with branching: > > I'm in branch master; I create a new branch; checkout new branch (called > 'test')

[git-users] starting out with git -- a problem with branching....

2013-09-03 Thread maya melnick
hi, I'm just starting out with Git... I have a little issue with branching: I'm in branch master; I create a new branch; checkout new branch (called 'test'); I make changes and save them; I switch back to branch master; but changes I made in branch 'test' are still there... they do not get

Re: [git-users] Re: Multiple clones of the same remote repo

2013-09-03 Thread Konstantin Khomoutov
On Mon, 2 Sep 2013 21:43:26 -0700 (PDT) Juha Aaltonen wrote: > I guess I described the problem. I guess I explained the reason for `git fetch` reporting everything is up-to-date and `git pull` complaining about conflicts. > I don't seem to be able to update my working tree from the remote > rep

Re: [git-users] How to delete files from repository

2013-09-03 Thread Konstantin Khomoutov
On Tue, 3 Sep 2013 02:30:36 -0700 (PDT) Quentin Silvestre wrote: > I have a repository with a remote repository. > My colleague had the very bad idea to put 4 project into the same > repository. > So basically here is my folder structure: > root > + project 1 > + project 2 > + project 3 > +

[git-users] How to delete files from repository

2013-09-03 Thread Quentin Silvestre
Hi guys, I have a repository with a remote repository. My colleague had the very bad idea to put 4 project into the same repository. So basically here is my folder structure: root + project 1 + project 2 + project 3 + project 4 So I'm trying to separate all theses projects in 4 different git

Re: [git-users] Migrate multi-repository setup form SVN to GIT

2013-09-03 Thread Sascha Egerer
Thank for you answers. Am Dienstag, 3. September 2013 10:44:10 UTC+2 schrieb Magnus Therning: > > Your email client seems to be set to sending HTML-only, which means my > email client wasn't able to display the illustration of the SVN repo > properly. I've hopefully guessed correctly in my att

[git-users] Files unexpectedly ignored in git repo!

2013-09-03 Thread A Moore
*I manually loaded a few files in my repository and some files are now ignored without being specified as ignored in gitignore.* *here is a brief discussion on stack overflow on this issue. We suspect this is a bug.* * * http://chat.stackoverflow.com/rooms/36566/discussion-between-xdrone-and-jsz

[git-users] Suspected Bug Files unexpectedly ignored in git repo

2013-09-03 Thread A Moore
I manually replaced come files in a dev repo and not i have a few files ignored without add these files to gitignore. We suspect this is a bug, here is a discussion that prompted this post. http://chat.stackoverflow.com/rooms/36566/discussion-between-xdrone-and-jszakmeister -- You received this

Re: [git-users] Migrate multi-repository setup form SVN to GIT

2013-09-03 Thread Thomas Ferris Nicolaisen
On Tuesday, September 3, 2013 10:44:10 AM UTC+2, Magnus Therning wrote: > Based on your description above I think you can get away with only a > single central git repo that the country-based operations can clone. > The country-repos would then base their 'master' on a tag, make a few > country

Re: [git-users] Two way mirroring because over network zones

2013-09-03 Thread Anders Sveen
Thanks for the input guys. We could do an automatic sync with manual notifications on merge conflicts (would probably be rare), but I think we will smplify our setup like Konstantin suggests. For reference: * We have many readers of the repo in zone two, so we set up a clone --mirror as a read

Re: [git-users] Migrate multi-repository setup form SVN to GIT

2013-09-03 Thread Magnus Therning
Your email client seems to be set to sending HTML-only, which means my email client wasn't able to display the illustration of the SVN repo properly. I've hopefully guessed correctly in my attempt to adjust it below ;) On Mon, Sep 02, 2013 at 10:40:55PM -0700, Sascha Egerer wrote: > Hi, > > we a

[git-users] Re: Migrate multi-repository setup form SVN to GIT

2013-09-03 Thread Alex Lewis
If you want to keep your process relatively similar then I think it might look something like... development (repo) - master (<=> trunk) - branches from master. - tags on master. de (repo) - master (<=> trunk) - branches from master (if necessary, probably a good practice to create a

Re: [git-users] Re: Multiple clones of the same remote repo

2013-09-03 Thread Magnus Therning
On Mon, Sep 02, 2013 at 09:59:43PM -0700, Juha Aaltonen wrote: > To put it more clearly: > > There are a couple of guys working with a code and there's a common > repo on a server. > > I cloned the remote repo with both Giteye and SourceTree (two > different clones). > I edited the code cloned wi