from:"Nelson Efrain A. Cruz"

Re: [git-users] How does GIT handle Coreqs

2018-09-17 Thread Nelson Efrain A. Cruz

Hi, Github or Gitlab will allow you to enforce some level of restrictions,
mostly about who can or can't merge branches or can access to the repo at
all. I never used gerrit so I can't say much about it.

Git (check git hooks) will allow you to run scripts in different situations
(i. e. before making a commit or before a merge) so you can make some
validations (or whatever you want) and decide if you want to abort the
current action. With this, for example, you can reject some one code if
they don't pass some validations.

I know for sure that gitlab will allow you to add hooks to individual repos
so you can enforce custom permissions, i don't know about github. This can
help you to enforce some workflow, have in mind that maybe you will need to
develop the scripts.

There are many workflows, you should learn from them and make one suited to
your needs, search for git workflows you will find many. IMHO almost every
team have a different  workflow.

El lun., 17 sept. 2018 a las 20:37, Karo Zans ()
escribió:

> I see.  Thank you for the response.  I agree with what you say.
> Unfortunately, I am dealing with about 250 different developers who have
> been on the same project for 15, 25, and even 35 years and they are all
> stuck in the old school way of doing things.
> Asking them to adopt a new tool is like extracting teeth.  I can't tell
> you how many times I've heard, "What we do now works, so why change?".
> Frankly the only reason why we are moving to GIT from the old system is
> because the old tool isn't being supported anymore.
>
> Thanks for the information on the workflows.  I think I have heard that
> some people like Google use Gerrit in combination with GIThub.  That is
> supposed to enforce permissions, is that right?  Where can I find these
> workflow models?  I think I saw some basic ones in the GIT user manuals,
> but they didn't seem to work for us.  Is there a good place I can look at
> several workflows?
>
> Thanks
>
> On Mon, Sep 17, 2018 at 4:23 PM Philip Oakley 
> wrote:
>
>> Hi,
>>
>> Most processes are driven by the limitations of the local tool and the
>> experiences of local staff and managers. This also affects the way teams
>> are structured (see Conway's Law).
>>
>> Git, with it's 'Distributed control' model, tends to break the old
>> paradigms which were based on the 'absolute single master ' idea (one
>> master drawing / paper record). Git avoids the need to limit peoples
>> scope by separating the modification step from the acceptance step.
>>
>> Clearly it us reasonable that people generally stay within their lead
>> area, but there is nothing wrong with stepping into other areas with
>> carefully crafted and explained changes. They won't be accepted, I hope,
>> if they fail that criteria. It is important to have a high quality
>> senior dev at the acceptance stage who is firm but fair.
>>
>> The fact that git branches are free and easy makes this freedom easier.
>> Have a look at the various workflow models, including Nvie's and that of
>> git itself (4 layer: master, next, pu (potential updates), maint).
>>
>> Philip
>>
>> On 17/09/2018 21:17, Karo Zans wrote:
>> > Hi everyone.  I have a question.  At my current company, we have quite a
>> > few developers.  Each team has about 10 or 15 developers that are only
>> > allowed to modify their specific code areas.
>> >
>> > On our current bug and new development tracking system, we have bug
>> ticket
>> > that code changes are tied too, and sometimes a bug ticket is marked at
>> a
>> > CoRequisite of another bug ticket.
>> >
>> > Basically if a person on another team has to implement a function or
>> > feature or bug fix in their code, I will mark my bug ticket as a
>> > CoRequisite of their bug ticket, if my code depends on the new function
>> > they are adding or fixing.
>> >
>> > So I was wondering, how does GIT enforce this?
>> >
>> > I realize that I could simply create a branch off of another person's
>> > branch and that will indicate that my code depends on their code, but
>> > suppose I finish my code before they finish their code.
>> >
>> > If a sub branches code is merged into Master before, the parent branch
>> is,
>> > the code will be broken.
>> >
>> > How does GIT mitigate/enforce this so that the build isn't broken?
>> >
>> > 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

Re: [git-users] regarding fix on "git clone $there $here"

2018-05-09 Thread Nelson Efrain A. Cruz

The release note that you cited says that the previous behavior was
erroneous. There is nothing about deleting the folder in the man page [1]

1 https://git-scm.com/docs/git-clone#git-clone-ltdirectorygt

El mié., 9 de may. de 2018 a la(s) 02:10,  escribió:

> Dear git experts,
>
> Recently we try to upgrade ubuntu from 17.10 to 18.04, then we found one
> inconsistent behavior on git clone.
>
> At 2.14.1 or 2.15.1, if I run command like
>  - mkdir /tmp/111
>  - git clone g...@github.com:111/111 /tmp/111
>
> because it will failure, then /tmp/111 will be removed automatically.
>
> However, at latest 2.17.0 which is part of ubuntu 18.04, seems like git
> clone failure will not auto remove this folder. I notice 2.16.2 and 2.17.0
> release note includes this fix. So just wonder to know if prior behavior
> was think of bug, and this fix has change the behavior.
>
>  * "git clone $there $here" is allowed even when here directory exists
>as long as it is an empty directory, but the command incorrectly
>removed it upon a failure of the operation.
>
> Thanks & Regards
> Leslie Wang
>
> --
> 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/d/optout.
>

-- 
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/d/optout.

Re: [git-users] Re: Trying unsuccessfully to merge a branch back into master using egit.

2018-05-09 Thread Nelson Efrain A. Cruz

Hi, you should try to do the merge from the command line and paste de error
messages if you want some help.

El mié., 9 de may. de 2018 a la(s) 09:30, Tony Chamberlain <
chamberlain.anth...@gmail.com> escribió:

> We have a whole department using git who, when there are conflicts, undo
> all their changes, save them somewhere, replace with head, pull and then
> redo their changes, as no one can figure out this merge.
>
> On Thursday, March 22, 2018 at 11:26:06 AM UTC-5, Tony Chamberlain wrote:
>>
>> I want to merge the two branches as shown in the attached image, using
>> egit with Eclipse.
>> I came across this, which does not work for me:
>> https://allaboutmynonexistedworld.wordpress.com/2014/02/05/eclipse-git-merging-branch-to-master/
>>
>> I cloned the two as you see.  Kept trying things.  First the local just
>> showed "master" so I went to remote and right clicked on checkout, and
>> checked it out.  I did then try as above to do "merge".  I did get a window
>> about conflict which I clicked OK on (see 2nd attachment).  But then
>> nothing was shown as red.  When I did a synchronize on my master, there
>> were no changes.  I did not get any red and could not open a merge tool.
>> What am I doing wrong?
>>
>>
>>
>>
>> --
> 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/d/optout.
>

-- 
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/d/optout.

Re: [git-users] Trouble Creating Remote Repo on USB Drive

2018-04-25 Thread Nelson Efrain A. Cruz

Hi, it looks like your problem it's not related to adding a new remote
repo. Check that your local repo it's ok (looks like you don't have any
commit on it).

El jue., 1 de feb. de 2018 a la(s) 00:19, Ray Bowman <
raybowman20...@gmail.com> escribió:

>
> Hi,
>
> I'm trying to create a remote repository within a directory on a USB drive.
>
> I'm using git-bash on Windows 10 64-bit.
>
> I followed the instructions from the following SO post:
>
> https://stackoverflow.com/questions/43569757/how-to-use-usb-drive-as-remote
>
> The USB frive is on F.
>
> I cd'ed to the path that I want to place the remote repository:
>
> $ CD /F/sys_2017/drv_D/projects/project_01
>
> then:
>
> $ git init --bare git_repo_01
>
>
> The primary drive is on drive D.
>
> I then cd'ed to the path for the local repository:
>
> $ cd /D/projects/project_01
>
> Then:
>
> $ git remote add usb_repo_01 /F/sys_2017/projects/project_01/git_repo_01
>
> Then:
>
> $ git checkout master
> error: pathspec 'master' did not match any file(s) known to git.
>
> I tried this:
>
> $ git worktree list
> /D/projects/project_01  000 (error)
>
> Can anyone tell me what I've done wrong?
>
> 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/d/optout.
>

-- 
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/d/optout.

Re: [git-users] How does npm git+file protocol work

2018-04-25 Thread Nelson Efrain A. Cruz

You should read this
https://git-scm.com/book/en/v2/Git-on-the-Server-The-Protocols

El dom., 11 de feb. de 2018 a la(s) 13:25, Michael 
escribió:

> Hello,
>
> Specifically as concerns supporting JavaScript npm registries, per se.
> Their documentation "mentions" that it is supported, but I do not see
> illustrative examples of what that is. Methinks that this is an npm thing,
> but not far behind that is Git itself.
>
> I am 99% certain that I would commit my JavaScript/Node.js package to my
> repository (registry) and then "git tag" it accordingly.
>
> However, what is git+file protocol as far as Git is concerned? Not to be
> confused with Node/js support for installing from a folder.
>
> Would that simple be "git+file://path/to/repo-name"? How about on a
> Windows system? "git+file://D:/path/to/repo-name"? or Linux?
> "git+file:///path/to/repo-name"? With "git+file://" literally being the
> prefix that npm wants in this instance.
>
> That's assuming things like machine, port, credentials, etc, are all
> resolved as localhost (for instance) and/or configured in the user's global
> Git config.
>
> The folks with npm and/or npmjs.com are not especially responsive on the
> topic, much less helpful.
>
> Regards,
>
> Michael Powell
>
> https://docs.npmjs.com/cli/install
>
> https://github.com/npm/npm/blob/5e426a78ca02d0044f8dd26e0c5f881217081cbd/test/tap/add-remote-git-file.js#L20
>
> --
> 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/d/optout.
>

-- 
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/d/optout.

Re: [git-users] Re: Malicious Coder

2017-07-21 Thread Nelson Efrain A. Cruz

If you don't trust him don't give him direct access to the repo. Instead
you should accept changes that he send to you in the form of patches or
changes in a fork (a fork of the repo) through merge or pull requests[1],
the last depends on how you share your repo. This will allow you to do a
code review and deny any bad changes. Please read 1 for more explanation.

[1] -
https://git-scm.com/book/en/v2/Distributed-Git-Contributing-to-a-Project

El jue., 20 de jul. de 2017 a la(s) 14:14, Igor Djordjevic <
igor.d.djordje...@gmail.com> escribió:

> Hi Lucky Limey,
>
> On Thursday, July 20, 2017 at 4:46:20 PM UTC+2, Lucky Limey wrote:
>>
>> I have a private repository set up for a project. I may be heading for a
>> dispute with one of the coders How do I protect the repository from
>> vandalism? I would hate for him to delete all our work etc. etc.
>>
>
> By removing his write access to the repository? Or just making a clone, or
> a simple copy of it...?
>
> Otherwise, what are you exactly concerned with?
>
> One of the beauties of a distributed version control system, which Git is,
> makes for each repository clone being a full/original/authentic repository
> copy. So as long as at least one person has the repository (locally, or
> wherever), the code and its history can`t get lost/damaged, no matter if
> some repository you`ve declared "central" gets corrupted/deleted/lost - you
> would just clone it again from any other still existing repository.
>
> For example, if I have a GitHub repository, I`ll most probably have a
> local clone of it, the one which I`m working on, so even if my GitHub
> repository gets deleted/detroyed it won`t really matter as I still have
> everything in my local clone, and I can easily recreate GitHub repository
> as if the issue never happened.
>
> Only in case if I`m the only one having the GitHub clone, and I haven`t
> synchronized my local clone lately (through fetch/pull) and there were some
> changes on GitHub side which gets destroyed, I would lose those latest
> commits since my last synchronization, but that`s really the worst case
> scenario - usually more than one person would work on GitHub repo, and any
> of them might have a more recent clone (or s fully up to date one).
>
> Anyway, nothing beats regular/planned backups, just that Git might even
> save you when you (think you) don`t have one :)
>
> Regards,
> Buga
>
> --
> 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/d/optout.
>

-- 
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/d/optout.

Re: [git-users] Want to modify .git/config file globally for entire project so that it gets changes for all people who does git pull or clone

2017-06-21 Thread Nelson Efrain A. Cruz

AFAIK there is no way to directly share hooks and configs, they are defined
per repo and each clone of a repo it's a repo itself. But if you have a
central repo where everyone share it's changes, then you can enforce the
things that you want before they push to that repo.

On the other hand (for example) for php there is grumphp, when you install
it he puts himself in a git hook. Then you can put it like a dependencie in
your project (it works well when you have another php dependencies) to
"enforce" the use of that hook.

El mié., 21 de jun. de 2017 a la(s) 07:16, dheeraj m 
escribió:

> Hi,
>  We would like to modify the .git/config file globally for entire project
> in the git repository.
> We would like this custom config get downloaded for all the users who does
> git clone or git pull for this project. Is there a way to do so?
> If not is there a way to configure git hooks(commit hooks) to be modified
> globally for project so that is effective for each and every user who does
> git clone locally in their system?
> Thanks and Regards
> Dheeraj M
>
> --
> 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/d/optout.
>

-- 
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/d/optout.

Re: [git-users] Will Git suit my needs? If so then which version/toolset?

2017-05-16 Thread Nelson Efrain A. Cruz

Hi, you are confusing git with the tools that use git. Git it's only a
version control system, ie it has no authorization or authentication
methods nor concepts of projcts. It only cares about versioning.

Then you have tools like github (which I think you call Git Enterprise)
which are builded around git to add extra features like authorization or
code review tools.

To clarify your ideas you should take a look at:

* The Pro Git book(1), at least the first chapter
* Read about Git Workflows. The Pro Git Book has a chapter about that,
another (but maybe overcomplicated one) good thing to read is (2)
* Search about Continous Integration tools (like Jenkins or gitlab-ci) to
automatize some task. But I think you will have some troubles to use this.
Also take a look at the git hooks.

1 - https://git-scm.com/book/en/v2
2 - http://nvie.com/posts/a-successful-git-branching-model/

El dom., 14 de may. de 2017 a la(s) 15:20, barrjamy via Git for human
beings  escribió:

> First of all, apologies if this is not the right place to ask this lengthy
> question. I have done quite a bit of research so far, and am at the stage
> of being overwhelmed with info, and just getting more confused.
>
>
>
> I work for a company in a department that has just been merged into with
> IT area. The significance of this, and the reason for this question, is
> that I have been advised that we need to start using Git for version
> control. Which is all fine, however we seem to have numerous types of Git
> available, and I am struggling to determine which will be best for our
> team’s needs. Then the main issue being that the system we do development
> is an enclosed ecosystem, with its own editor. So for Git to work, it means
> exporting the developments to text files, which we can do, but we don’t
> work from these text files.
>
>
>
> We have access to:
>
> Git Enterprise, Git Bash, Git stash (same as bitbucket?) and Git Desktop
> (I think)
>
>
>
> What we do:
>
> The company has an accounting/leger system, and provides administration
> services to clients. From this system we provide reports to clients
> containing various info. Our job is to develop these reports and update
> them as required.
>
>
>
> How we do it:
>
> We develop these reports on a proprietary (some might say archaic!)
> system, using the system provided GUI. The code for these reports are
> backed up as a text file. It is these text files that we would be looking
> to version control.
>
> At the moment we have various area’s that we work in. We have the “live”
> area, which is where the reports get copied to once development and testing
> is complete. Then we have numerous “project” area, which start of as copies
> of the live area, and is where we do the development and testing of the
> new/amended reports.
>
> Once the development of a report is complete, we copy the new/amended
> report from the project area, to the live area.
>
>
>
> Question:
>
> 1) I am really struggling to visualise how this will work using Git. The
> way I think we will use it is,
>
> -  Treat the project areas as branches
>
> -  do the dev in the project area under a new branch
>
> -  then when the dev is complete, merge with the main version in
> the project area
>
> -  then (not sure of this part) daily export the files in the
> project area,
>
> -  find any that have changed (i.e. been merged with the dev
> branch)
>
> -  then merge any changes into the live report backups
>
> -  import any changed backups into the live area
>
>
> 2) Which Git tools to use? We need to be able to automate this process to
> some degree, needs to be relatively simple to use and collaborate over
> various locations (which is why Git is being pushed I imagine)
>
>
>
> From my initial investigation, I am unsure of the best way to get started.
> The only limited experience I have of version control software was SVN some
> time ago, which I used briefly as part of a module at when I was a student.
>
>
>
> I am not expecting a step by step guide from here, just some
> suggestion/advice of which interface will possibly best suit our needs.
> Maybe even some pointers with good resources on where to get started, that
> would be relivant to these needs.
>
>
>
> Many thanks in advance to anyone who takes time to offer advice. It’s much
> appreciated!
>
> --
> 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/d/optout.
>

-- 
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

Re: [git-users] Newb question: can some one explain to me why, when pushing Sass files, only the compiled .css file gets flagged as a merge error and not the .scss files?

2017-01-25 Thread Nelson Efrain A. Cruz

I think that "the problem" is the compiled css file.

Let's see, probably more than one scss file are compiled to one single css
file, say a.scss and b.scss are compiled to c.css. If you change only
a.scss in one commit and then try to pull another commit with b.scss
changed you will have no conflicts in scss files, but c.css file will be
changed in both commits (wich can lead to a merge conflict depending on the
situation).

El mié., 25 de ene. de 2017 a la(s) 01:42, AD S 
escribió:

> Ah, so presumably in setting up my development box, some one told git not
> to track .scss files.
>
> Cheers
>
>
> On Wednesday, January 25, 2017 at 11:42:27 AM UTC+10, charlesmanning wrote:
>
> Git has no magic knowledge of scss files or css files. It will track
> whatever you tell it to track.
>
> So for example let's use something more people are familiar with  -
> something like C.
>
> If you tell git to track foo.c it will track foo.c.
> If you tell it to  track foo.o it will track foo.o.
>
> If you tell it to track both it will track both.
>
> Same with your scss and css files.
>
> Generally you don't want to track derived files (ie. stuff that is an
> output from compiling) - though there are exceptions to this.
>
> If you no longer want to track the css file than remove it from git with
> git rm
>
> You might also want to add it to your .gitignore file too.
>
>
>
>
> On Wed, Jan 25, 2017 at 2:19 PM, AD S  wrote:
>
> So, if I make changes to a .scss file and compile it into a .css file and
> then push the entire project to a remote repo, there are 2 files that have
> been altered, right?
>
> I've noticed, however, that only the .css file appears with merge conflict
> notices.
>
> Would anyone know why this is? Could it be the way my company set up git?
> To automatically accept that my version of the .scss files will always
> override the remote repo's version?
>
> --
> 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+...@googlegroups.com.
>
>
> For more options, visit https://groups.google.com/d/optout.
>
> --
> 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/d/optout.
>

-- 
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/d/optout.

Re: [git-users] Noob question: In a large company setting, is it normal to spend 3+ hours a day sorting out git issues?

2017-01-11 Thread Nelson Efrain A. Cruz

It's not normal. Is everyone expending that much time solving git issues?
Or it's just you?

I would say that you are still learning to use git. It take some time to
learn to use it reasonably well. Also it's better to understand how it
works, not just how to use it, you will see git in other way.



El mié., ene. 11, 2017 21:47, Charles Manning 
escribió:

On Thu, Jan 12, 2017 at 1:35 PM, AD S  wrote:

Hi all,

Sorry I really don't mean for this to sound pessimistic or whiny - it
really is a genuine question.

I come from a background of solo work where I didn't really use git all
that much. Now I work with a very large company and git is a huge part of
the workflow.

However, I spend usually around 3hrs a day just trying to sort out strange
issues I come up against with git. Everyone else here just seems to think
this is par for the course, but it frustrates me a lot.

Is this normal when working with large 100+ organisations?


Nope.

Problems like this generally result from people trying to be too clever and
making more problems than they solve.

A 100+ organisation should likely be working across multiple repos rather
than just one. You are more than likely working as, say 20 teams of 5
people.

Use lots of branching.


-- Charles



-- 
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/d/optout.

-- 
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/d/optout.

Re: [git-users] Re: No available terminals

2016-12-19 Thread Nelson Efrain A. Cruz

There is a specific mailing list for git for windows,

Try:
https://groups.google.com/forum/?hl=en#!forum/git-for-windows
or
https://groups.google.com/forum/#!forum/msysgit

El lun., 19 de dic. de 2016 a la(s) 11:07, Dexx Mandele 
escribió:

> This *is* the right place to report git issues, right? Because at the
> moment git is forcing me to restart several times a day to circumvent this
> problem. A fix, a work-around, or even some basic pointers would be greatly
> appreciated.
>
>
> On Thursday, December 15, 2016 at 12:16:51 PM UTC+1, Dexx Mandele wrote:
>
> I generally run several git bash instances at a time to keep track of
> several interlinked packages. Once in a while I suddenly get this error
> when I try to open a new git bash terminal.
>
> Error: could not fork child process: There are no available terminals (-1).
>
>
> 
>
>
> All the running terminals remain operational, I just cannot open any new
> ones. If I close them all, I can usually re-open several of them, but never
> as many as I had to begin with. At that point the system seems to have
> decided on a set maximum; every time I close a terminal, I can open one,
> but I can never again go beyond the arbitrary max.
>
>
> Other terminals will spawn fine: I can still run new instances of
> git/bin/bash.exe, as well as cmd. It's just git-bash that borks. I've tried
> running from the start menu, explorer and from bash with the same result.
>
>
> Environment details:
> OS: Windows.
> OS version: 10 64-bit
> Git package: 2.10.0-64-bit
>
> --
> 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/d/optout.
>

-- 
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/d/optout.

Re: [git-users] Help to understand git merge conflicts

2016-11-23 Thread Nelson Efrain A. Cruz

When you are in a merge conflict, some of your files will be modified by
the changes you are merging (some others will be added or deleted) and
others will be in conflict. You need to fix those files with conflicts in
order to finish the merge. So those changes that other person made are in
there because you are in a merge conflict.

You should read [1]

[1]
https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging#_basic_merge_conflicts

El mié., 23 de nov. de 2016 a la(s) 16:43, Daniel PRESA <
daniel.c.pr...@gmail.com> escribió:

> Hi everyone,
> So here is the thing, i just don't get the git merge conflict and how to
> resolve them,
> especially when i already tried to resolve the conflict and finished to
> have half my changes merged, the other all ignored and files someone have
> modified in me personnar repository i dont even know how.
> I tried to find documentation about how to resolve this but i don't find
> anything i can understand, it's really depressing.
>
> Thanks for your help
>
> --
> 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/d/optout.
>

-- 
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/d/optout.

Re: [git-users] GIT API Provider?

2016-11-22 Thread Nelson Efrain A. Cruz

Maybe it's better that OP explains what he is looking for.

El mar., 22 de nov. de 2016 a la(s) 11:01, Dennis Kaarsemaker <
den...@kaarsemaker.net> escribió:

> On Tue, 2016-11-22 at 02:58 -0800, Vivek Vivek wrote:
> > Hello GIT experts,
>
> git is not an acronym, no need to capitalize :)
>
> > I am new to GIT world.I would like to know which third party provider
> > (e.g Bitbucket,Gitlab,Github)  provides more API resources?
> >
> > thank you in advance.
>
> I find that question a bit odd, as more isn't necessarily better.
> Instead, look at your requirements and see which of these three provide
> what you need.
>
> That said, GitHub provides by far the most complete and usable api.
> Having used all three API's for creating cli clients, I also found
> github's API easiest to work with.
>
> --
> Dennis Kaarsemaker
> http://www.kaarsemaker.net
>
> --
> 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/d/optout.
>

-- 
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/d/optout.

Re: [git-users] Best Practices around version control / configuration management of Python / Spark Machine Learning Models on Git

2016-11-03 Thread Nelson Efrain A. Cruz

Well I think that in the end it's just code, maybe the difference it's that
this code changes very often.

Just make a commit every time you achieve something (or some task is
completed). If you are worried about having different versions of a same
model, you can use branches to keep them organized.

You can search about git workflows to have a better idea of the different
approaches (maybe these workflows are overkill for your problem).

Sorry if I oversimplified your problem!

El jue., 3 de nov. de 2016 a la(s) 14:02, Debabrata Ghosh <
mailford...@gmail.com> escribió:

> Hi,
> Greetings !
>
> I need certain best practices / guidance around how to
> effectively version control advance analytical models written in Python /
> Spark on Git. The advanced analytical models are a bit different to the
> normal Java code. As the training of the advanced analytical models is
> iterative therefore any guidance around at what time we should commit the
> code into Git will be quite useful for me.
>
> Thanks for your response in advance !
>
>
> Thanks,
>
> Debu
>
> --
> 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/d/optout.
>

-- 
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/d/optout.

Re: [git-users] Try as I might, I just don't understand git. Can anyone please help me out?

2016-10-25 Thread Nelson Efrain A. Cruz

Have you read the pro git book? It's a really good and high quality book,
it sure will be better than a tutorial. It goes from the basics to really
deep subjects.

El mar., 25 de oct. de 2016 a la(s) 04:32, Gergely Polonkai <
gerg...@polonkai.eu> escribió:

>
>
> On Tue, Oct 25, 2016, 07:53 AD S  wrote:
>
> Honestly I must have watched hours of videos and completed 4 or 5 online
> tutorials and it's still not clicking.
>
>
> Could you show us which ones? The errors
>
>
> I understand the concept: that git is a sub-versioning tool. It makes
> sense. I know why one would use it.
>
>
> Let's just call it Version Control System. subversion is another tool with
> the same purpose.
>
>
> But every time I try to use it something just breaks or goes wrong or
> blows up.
>
> This has happened just this week, for example:
>
>
>- Got error saying I was on the wrong branch, when I wasn't (this just
>after a `git commit` command on a new branch).
>
> git never says you are on a wrong branch. Could you show us the exact
> error message ?
>
>
>- After a being able to commit and push to github all last week, I
>randomly got a 'Connection refused' message (github.com was still up).
>
> There are tons of reasons that can lead to such an error message, most of
> them being related to network issues, not Git.
>
>
>- Went to pull 7 files from a branch but for some reason, this time,
>it pulled hundreds of files from the whole, broader project.
>
> As commits are snapshots of the whole “project”, you can not pull changes
> to only a set of files; you will get everything.
>
>
>- A few times I got kicked out of the branch after a failed commit and
>wouldn't let me return to branch because I had files waiting to be
>committed. Only way was to hard reset.
>
> What do you mean “kicked out”? As Git does not have access control built
> in, it cannot deny you from accessing a branch. Again, it would be helpful
> to see an error message .
>
>
>- Saying there are merge conflict issues, but not showing what files
>there are on.
>
> git-merge output will not necessarily show you which files have conflicts
> (although it is possible to parse it by eye). If you need such information,
> use git status.
>
>
>- Files that were tracked randomly become un-tracked.
>
> That means they were removed from tracking either by you or by someone
> else, e.g. with git-rm
>
> These are a few, but in reality many similar problems happen throughout
> the day which really impacts my productivity. When I started, and studied,
> git I thought it would be pretty straight forward: pull the files you want
> to work on, make changes, push them and if there is a conflict error fix
> it. But it's complexity is beyond me.
>
> So, am I just cursed? What am I missing here?
>
> --
> 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/d/optout.
>
> --
> 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/d/optout.
>

-- 
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/d/optout.

Re: [git-users] Could GIT help with this task?

2016-09-08 Thread Nelson Efrain A. Cruz

I think that any vcs will help you, but as already said, there will be no
magic. You will need to do de merging manually (in many cases) and after
that, you will need to check that everything it's alright.

El mié., 7 de sep. de 2016 a la(s) 19:29, 
escribió:

> Hello,
>
> I thought the git is good for all types project. Because the Linux
> distribution using this Version Control System. I haven't sure this
> thought, am I right?
>
> Thanks
>
> terça-feira, 6 de Setembro de 2016 às 23:26:54 UTC+1, charlesmanning
> escreveu:
>>
>>
>>
>> On Wed, Sep 7, 2016 at 10:19 AM,  wrote:
>>
>>> Colleague:
>>>
>>> Before I decide to learn GIT I would like to know if it can partially
>>> handle a task which I will describe briefly.  I work with a large numerical
>>> weather prediction modeling system called WRF.  For sake of simplicity
>>> let’s suppose I start with version A which has been unmodified by me.  I
>>> make changes to A which makes version B.  Then comes along a new version C
>>> from the WRF distributer.  Would GIT help me take the changes I made in
>>> version B and incorporate them into version C to make a new version D?
>>> What would that operation be called in the GIT context?
>>>
>>> Many thanks,
>>> Kevin Doty
>>>
>>
>> That's merging.
>>
>> The way you'd do this is start with A, create a branch on which you do
>> your fiddling and end uopp with B.
>>
>> Likewise do the same for a branch with the changes ending up with C. Then
>> merge the two branches and see if that works.
>>
>> So it sounds like you're hoping git will magically do merges for you...
>> That might be wishing too much.
>>
>> Git is pretty good at merging changes in source code, but cannot
>> effectively merge binary code. Even machine XML is more like binary code
>> than text and often gets messed up.
>>
> --
>>> 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+...@googlegroups.com.
>>
>>
>>> For more options, visit https://groups.google.com/d/optout.
>>>
>> --
> 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/d/optout.
>

-- 
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/d/optout.

Re: [git-users] Not able to create Github account password

2016-05-04 Thread Nelson Efrain A. Cruz

Github accounts are independent of the user and email configured in
user.name and user.email. If you want, you can change those configs using
the same commands:

$ git config --global user.name "John Doe"
$ git config --global user.email john...@example.com

Git does not have a concept of authentication. You may be asked for a
password to push to github, but this is to authenticate to github, it isn't
related to git.


El mié., 4 de may. de 2016 a la(s) 17:25, hara chaitanya <
harachaita...@gmail.com> escribió:

> I was learning to user git-bash and github. As part of tutorial we were
> asked to set username & password through git-bash command line and create
> an account in github. But since I already set the email through gitbash
> global config, I am not allowed to create account or create a password for
> my account .
>
> Please let me know how can I create a account in github or delete the
> entry to start fresh.
>
> --
> 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/d/optout.
>

-- 
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/d/optout.

Re: [git-users] Retrieve logs from remote git repo and than get diffs for the past month

2016-03-31 Thread Nelson Efrain A. Cruz

If I'm not wrong, you can't avoid clone the repo. But the good thing is
that all the commands to produce the diffs will run really fast because
they all run locally.

Anyway you can add to your script the cloning part.

El jue., 31 de mar. de 2016 a la(s) 04:10, Sebastian Tarach <
star...@gmail.com> escribió:

> In the company I work for I was requested to write script/app that would
> retrieve all diffs in the past month for each author and put them in
> separate files. I was quite surprised when I found out I can't do that
> remotely but I have clone the repository first. Well it's not a big deal
> for our ~12 repos but it is a bit time consuming. Obviously in such case
> ls-remote was no help. We have such script for SVN and obviously do to it's
> centralized nature such this is possible. Therefore I'm wondering did I
> miss something? Maybe it actually is possible but I didn't do my research
> right?
>
> ~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/d/optout.
>

-- 
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/d/optout.

Re: [git-users] Remove .git folder from Master Repo

2015-11-02 Thread Nelson Efrain A. Cruz

Hi.
Whenever you clone (git clone) a git repo you get a repository, this means
that you can't use git init because it's already a repo and you will have
the .git folder. Now what you may want it's to discard the repo history,
it's that what you want?

El lun., 2 de nov. de 2015 a la(s) 8:02 a. m., Steven Ottz 
escribió:

> Because when I start a new project and git clone from github it pulls down
>>> a .git folder with all of the versioning from the repo.
>>
>>
> Because it was hidden, the clone I pulled down I went git init and it said
> git had already been initalized and when I showed all files I saw it had
> all the versioning with it
>
> --
> 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/d/optout.
>

-- 
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/d/optout.

Re: [git-users] How to download a specific release

2015-08-04 Thread Nelson Efrain A. Cruz

What you mean with download? You want a clone of the repo containing only
the history of a specific version? Or just the code from a specific version?

El mar, ago 4, 2015 14:01, Bideep Bezbaruah bbid...@googlemail.com
escribió:

 Hi,

 I am trying a find a way to download only specific release tags and not
 just any tag. Is there a CLI or API way to achieve the same?
 My scenario is, in a workflow I want to ensure that I allow retrieving
 only specific released code instead of just any tagged code.

 Thanks,
 Bideep

 --
 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/d/optout.


-- 
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/d/optout.

Re: [git-users] creating a new branch

2015-07-20 Thread Nelson Efrain A. Cruz

what I was trying to say is: your repo contains the files inside
administrator folder, so you can make a new folder called administrator
inside your repo and move all the files in the repo inside that folder.
Then the folder that contains your repo can be renamed to appointments and
moved one level up to replace the old appointments folder. At the end you
will have a repo that contains your administrator folder and all the old
history will be there, plus the history of the last change. Also your file
structure will be the same at the end.

I'm saying do not make a new repo, just make the change you need, maybe
this is not what you want at all.

El lun, jul 20, 2015 12:39, Dimitris Papageorgiou foryou1...@gmail.com
escribió:

Why move the repo one folder up...

It is already there...at C:\Apache24\htdocs\Appointments\Administrator\

I do not quite understand...but more importantly...*changing the dir
structure of my web project it is something I want to avoid..*..

Τη Δευτέρα, 20 Ιουλίου 2015 - 6:17:52 μ.μ. UTC+3, ο χρήστης Nelson Efrain
A. Cruz έγραψε:

Assuming that those are the only folders (and files), one solution could
be: move all your files (git mv) inside a folder called
Administrator (like C:\Apache24\htdocs\
Appointments\Administrator\Administrator) and then move the repo one
folder up.

I think this will be the easiest solution, of course there are other ways
but they are much more complex.

El lun., 20 de jul. de 2015 a la(s) 10:50 a. m., Dimitris Papageorgiou
foryo...@gmail.com escribió:

I have git init a working directory...here is
it C:\Apache24\htdocs\Appointments\Administrator

I now want to create git init another directory which sits *above *the
aforementionedC:\Apache24\htdocs\Appointments

Soin essenceI want to disregard/delete the old
branch/repo(C:\Apache24\htdocs\Appointments\Administrator)...*but keep
the commits and transfer them to the new repo.*

How am I going to do it? I hope I was clear.

--
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+...@googlegroups.com.

For more options, visit https://groups.google.com/d/optout.

--
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/d/optout.

--
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/d/optout.

Re: [git-users] creating a new branch

2015-07-20 Thread Nelson Efrain A. Cruz

Assuming that those are the only folders (and files), one solution could
be: move all your files (git mv) inside a folder called
Administrator  (like C:\Apache24\htdocs\
Appointments\Administrator\Administrator) and then move the repo one folder
up.

I think this will be the easiest solution, of course there are other ways
but they are much more complex.


El lun., 20 de jul. de 2015 a la(s) 10:50 a. m., Dimitris Papageorgiou 
foryou1...@gmail.com escribió:

 I have git init a working directory...here is
 it C:\Apache24\htdocs\Appointments\Administrator

 I now want to create git init another directory which sits *above *the
 aforementionedC:\Apache24\htdocs\Appointments

 Soin essenceI want to disregard/delete the old
 branch/repo(C:\Apache24\htdocs\Appointments\Administrator)...*but keep
 the commits and transfer them to the new repo.*

 How am I going to do it? I hope I was clear.

 --
 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/d/optout.


-- 
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/d/optout.

Re: [git-users] ssh admin git accidentally deleted

2015-07-07 Thread Nelson Efrain A. Cruz

Can you be more specific, it seems that you are using more than just git.

El mar, jul 7, 2015 10:28, agnes monest monezone.cl...@gmail.com escribió:

 Dear all , I accidentally delete ssh admin git, unfortunately there just
 one admin so I can't make a change in the config and push to the
 repository. If there's a way undo the change or make an existing user
 become an admin or is there any super admin command?

 I use git version 1.7.5.4

 Thanks.
 Agnes

 --
 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/d/optout.


-- 
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/d/optout.

Re: [git-users] git cannot push

2015-07-03 Thread Nelson Efrain A. Cruz

Well if you are new to git it's reasonable that you don't understand the
previous (and really elaborated) answers. But try to read some more
chapters before saying that git it's that complex (in fact it is, but not
that much).
You may have more luck using github.com or bitbucket.com to share work (in
a public or private way), use their tutorials to a quick start.
Good luck with your final choice

El vie, jul 3, 2015 11:41,  p...@greenlogix.eu escribió:

 yeah I started reading it

 so to summurize

 on the windows CLI

 git add .

 git commit -m first commit
 [master (root-commit) 27331bc] first commit
  81 files changed, 33489 insertions(+)
  create mode 100644 somefile
 ...
  create mode 100644 someotherfile



 git push origin --all
 ..'s password:
 Counting objects: 93, done.
 Delta compression using up to 8 threads.
 Compressing objects: 100% (91/91), done.
 Writing objects: 100% (93/93), 2.46 MiB | 3.33 MiB/s, done.
 Total 93 (delta 17), reused 0 (delta 0)
 remote: error: refusing to update checked out branch: refs/heads/master
 remote: error: By default, updating the current branch in a non-bare
 repository
 remote: error: is denied, because it will make the index and work tree
 inconsist
 ent
 remote: error: with what you pushed, and will require 'git reset --hard'
 to matc
 h
 remote: error: the work tree to HEAD.
 remote: error:
 remote: error: You can set 'receive.denyCurrentBranch' configuration
 variable to

 remote: error: 'ignore' or 'warn' in the remote repository to allow
 pushing into

 remote: error: its current branch; however, this is not recommended unless
 you
 remote: error: arranged to update its work tree to match what you pushed
 in some

 remote: error: other way.
 remote: error:
 remote: error: To squelch this message and still keep the default
 behaviour, set

 remote: error: 'receive.denyCurrentBranch' configuration variable to
 'refuse'.
 To ..:/home//REPOSITORIES/Fizgig
  ! [remote rejected] master - master (branch is currently checked out)
 error: failed to push some refs to ':/home/webadmin/REPOSITORIES/...'

  --
 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/d/optout.


-- 
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/d/optout.

Re: [git-users] git cannot push

2015-07-03 Thread Nelson Efrain A. Cruz

It's seems that you are trying to push to a non bare repo, also in git you
are always using branches but depending on how you use git you may not
notice that.

I think the better for you it's to read [1] it's not too large and it's
pretty didactic. There it's no short answer for your question.

[1] https://git-scm.com/book/en/v1

El vie, jul 3, 2015 10:15,  p...@greenlogix.eu escribió:

 hello,

 I cloned a rep I installed on a ubuntu machine (empty rep)

 as I add files to that empty working copy, I can commit them (I use
 SourceTree)
 but once I do the push, I get an error,

 master - master (branch is currently checked out)

 I try to find some infos, but the more I dig, the less I understand Git

 I been told to either do a pull instead of a clone or do a init --bare

 but I dont want branching !!

 the goal is to have two people working on the same code and merging what
 they do to the repository (mater, origin , whatever, I dont even know what
 it is)

 can someone enlight me, I just don understand git at all

 svn was crap but way simpler to use

 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/d/optout.


-- 
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/d/optout.

Re: [git-users] question about merge commits

2015-07-01 Thread Nelson Efrain A. Cruz

This happens depending on how the history of the repos has diverged.
Basically when you make a pull you are doing a fetch and a merge in the
background. So there are two types of merges, one of them ends with a
commit merge the other don't.

It's better explained in
https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging

El mié, jul 1, 2015 08:10, Amr Elhosiny eng.amr2...@gmail.com escribió:

 Guys,

 I have a question about merge commits. Now when I perform git pull from
 somebody. Sometimes I'm getting a merge commit where I should write a merge
 commit message. Sometimes it does not happen, I just hit the git pull and
 it pulls the updates without creating a merge commit.
 What is the difference ? note that the files modified in the new commit
 -when getting a merge commit- are only maintained by a single user.
 And how can I avoid these merge commits as long as the file is maintained
 by one user ?

 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/d/optout.


-- 
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/d/optout.

Re: [git-users] Working Copy on remote not updating

2015-06-16 Thread Nelson Efrain A. Cruz

Are you pushing to a bare repo? (It's recommended to only push to a remote
repo) . It's seems you are not, cause you wouldn't have a working directory
at all.

Take a look at https://github.com/blog/1957-git-2-3-has-been-released there
is a new command push-to-deploy but I'm not sure if it's what you are
looking for (and I never used ). And as already said, git it's not a
deployment tool.

El mar, jun 16, 2015 08:08, Chad Baloga cbal...@gmail.com escribió:

 I am fairly new to GIT.  When we do a push to the remote repo, the Working
 Copy on the remote does not get updated automatically.  It shows the
 changes, then we have to either discard the changes or stash them.  If this
 normal or is there a way it can automatically update?  We have 2 branches.
 At first there was only 1 branch.  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/d/optout.


-- 
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/d/optout.

Re: [git-users] Avoid EOL hell

2015-06-02 Thread Nelson Efrain A. Cruz

Y prefer to ensure that everyone uses Linux EOL, but that's not an easy
task.

El mar, jun 2, 2015 14:37, Konstantin Khomoutov 
flatw...@users.sourceforge.net escribió:

 On Tue, 2 Jun 2015 22:09:46 +0530
 Rustom Mody rustompm...@gmail.com wrote:

  Setting up for a project in which both linux and windows will be the
  OSes.
 
  After spending some time searching for solutions I am as confused as
  ever. What are the optimum crlf settings so that files (maybe of
  designated types, say
  .c and .h files) are CRLF on windows and LF on linux?

 I recommend reading through [1].

 In short, core.autocrlf set to auto on Windows should, in theory,
 ensure that the text files have CRLF EOLs in the work tree and LFs
 in the index and the object store.  But that's, well, in theory, and
 you might need to cater for the bogosity of particular tools.

 (I'm assuming you're using Git for Windows on Windows.  Cygwin's Git
 lives in its own POSIX-y world and considers LFs to be the platform's
 native EOLs.  The installer of GfW sets core.autocrlf to auto
 by default, and, AFAIK, there's no way to tell it not to.)

 1. https://github.com/mono/mono/blob/master/.gitattributes

 --
 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/d/optout.


-- 
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/d/optout.

Re: [git-users] Re: Branching Questions

2015-03-02 Thread Nelson Efrain A. Cruz

I think you need to read http://git-scm.com/doc It's a really good book,
especially this section may help you
http://git-scm.com/book/en/v2/Git-Branching-Remote-Branches

The first reply have the answer you are looking for, the problem is in the
upstream branch.

El lun, mar 2, 2015 12:52, Michael J. Mahony mmah...@gmail.com escribió:

here is what I see when I run git branch -r

https://lh6.googleusercontent.com/-qZUnftWC0Ek/VPSHCF31QwI/NHU/Yd193ISnmBI/s1600/git-problem.PNG
You will note that I am in the branch dev but cannot see it.

On Friday, February 27, 2015 at 12:00:47 PM UTC-8, Michael J. Mahony wrote:

I am developing a web application and I am using GitHub to store my
source code. I set up a repository and have a MASTER branch.

I am fairly new to using Git and wanted to use this as a learning process.

Because I am using this as a learning process for using Git, I have some
questions.

I got my MASTER branch to a point where it was stable and now I want to
start doing some serious development. I had an up to date copy of MASTER on
my machine. I used bash and issued this command to create a DEV branch:

git checkout -b dev origin/master

Now when I do:

git branch -a

I see this list:

https://lh4.googleusercontent.com/-VBQZzyatwg4/VPCrRu25bVI/NGM/W0ExjjkVNmU/s1600/git-branches.PNG

I have also pushed this dev branch. However, on GitHub it only shows
one branch--MASTER

How can I get the other branch to be on GitHub so that I can grab it from
another machine when required?

Can someone explain to me how to accomplish this so that I am able to
have a branch for dev?

Thanks!

Mike

--
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/d/optout.

Re: [git-users] How to recover deleted files from a bad usage of .gitignore

2015-02-10 Thread Nelson Efrain A. Cruz

Hi, when you ignore a file in git it becomes invisible to git, so you can't
use git to try to recover it after a deletion.

About your question about git rm AFAIK it deletes the file and marks it to
the stage area. Anyway if you use git rm it means that you have the file
under git, so you can use git to recover it.

I remember, using git for Windows that some untraked files where deleted,
luckily it didn't make any damage in my repo.
I think you need to keep trying with file recovery utilities.
Good luck!

El mar, feb 10, 2015 20:49, sylvain bougnoux bougn...@imra-europe.com
escribió:

Hi all,

Does someone know where the files after a git rm go?
Some of my files where deleted by git, of course I have no copy, I tried
several file recovery utilities, but so far none of them see the deleting
files.
I am running Windows 7; git 1.9.4; gitextension 2.48.03

Full story:
One week ago I created a new repository from an old CVS server.
I checked it out from scratch (clone it), into CLONE, and copy the .git
folder into a folder, MyFolder, containing some changes that were not
pushed under CVS.
So far everything ran fine, I could pushed the new changes.
However, MyFolder contained also a a folder called Perso with some files I
did not want to push.
Therefore I added Perso/* into .gitignore. Then the folder Perso
disappeared as potential commit. So far so good.
Then I don't really remember what I've done, maybe clean some branches?
but yesterday I remarked that Perso/ was no more on the disk.
Currently there is no stash, no other branches.
I tried a menu (under GitExtensions) Repository/Git Maintenance/Recover
lost objects with option print out objects that exists but that aren't
readable from any of the reference nodes... without success.
I suppose git removed my files when switching the branch? Hence my
question, is there a change I could get these files back?
I am afraid they are lost... what a silly situation.

Regards,

Maybe it is close from

http://stackoverflow.com/questions/2691618/git-is-deleting-an-ignored-file-when-i-switch-branches

--
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/d/optout.

Re: [git-users] Please help with a git console command

2014-11-04 Thread Nelson Efrain A. Cruz

I think you are confused, github uses git. Git it's just control version,
the other features are part of github (like the issues) and have nothing to
do with git.
Anyway i think github provides a public API that you may use.

https://developer.github.com/v3/

2014-11-01 2:20 GMT-03:00 Ashiqur Rahman 2ashi...@gmail.com:

 I am new to github. Using git Console in Windows 8...Can anyone please
 tell me which command I should write in git console to get the participants
 who took part in a conversation about a particular issue like a bug. Thanks
 in advance..

 --
 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/d/optout.




-- 
Nelson Efrain A. Cruz - https://plus.google.com/106845325502523605960/about

Debes ser el cambio que esperas ver en el mundo -Mahatma Gandhi

-- 
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/d/optout.

Re: [git-users] Re: How to recover from a Detached Head

2014-10-31 Thread Nelson Efrain A. Cruz

://groups.google.com/d/optout.

 --
 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/d/optout.




-- 
Nelson Efrain A. Cruz - https://plus.google.com/106845325502523605960/about

Debes ser el cambio que esperas ver en el mundo -Mahatma Gandhi

-- 
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/d/optout.

Re: [git-users] remote depot with branch displayed; but no info from git remote

2014-10-31 Thread Nelson Efrain A. Cruz

Remote info is obtained from the config file of the repo. I don't know how
you created the remote repo but this info is missing in that repo.

Maybe you could just add the remote repo to fix your problem, if you have
remote refs you need to have the remote.

2014-10-30 11:31 GMT-03:00 Ben A bsanh...@gmail.com:

 Hi,
 I am new to git; and created a bare shared repository from one I had been
 working on.
 The shared depot has a reference to a remote branch I had copied from;
 but git remote gives no information.

 git branch -a
   branch1
   branch2
 * master
   remotes/origin/branch2

 git remote -v

 Did something break, or is it normal?  I was following directions in git
 guide using scp.
 Also, I wouldn't mind deleting this reference as I will be treating my new
 shared repository as the new origin; but wasn't sure how to clean up as
 origin is not listed by remote command.
 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/d/optout.




-- 
Nelson Efrain A. Cruz - https://plus.google.com/106845325502523605960/about

Debes ser el cambio que esperas ver en el mundo -Mahatma Gandhi

-- 
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/d/optout.

Re: [git-users] how corporates handle git repositories?

2014-09-05 Thread Nelson Efrain A. Cruz

Take a look at https://about.gitlab.com/, it's a good alternative, it works
great in our enviroment.


2014-09-05 1:26 GMT-03:00 madhan dhanikachalam 
madhan.dhanikacha...@gmail.com:

 I see github is a place to hold repositories so multiple people can work
 on a project.
 my question would be, I know for sure my company won't be OK with hosting
 our code in github or anywhere else outside of our internal servers.
 If this is the case and am sure other companies might have the same
 constraints. How are people hosting their repositories? Any tips do/dont's
 on how to handle repos internally?

 please share your thoughts. 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/d/optout.




-- 
Nelson Efrain A. Cruz - https://plus.google.com/106845325502523605960/about

Debes ser el cambio que esperas ver en el mundo -Mahatma Gandhi

-- 
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/d/optout.

Re: [git-users] Do I have to buy GIT or is it a open source revision control software to store my private work?

2014-07-01 Thread Nelson Efrain A. Cruz

Git is open source, check 1.

One thing, git is not a backup system. But I think there are some tools
that use git to make backup systems.

[1] http://git-scm.com/about/free-and-open-source


2014-07-01 4:16 GMT-03:00 K.V. Lakshmi lakshmiau...@gmail.com:


 Hi...
 I am working with a private organisation and want to use a revision
 control software to keep back-up for all our projects in a distributed
 configuration. As my company is a private, so I have to keep all projects
 as highly confidential.

 Can I download and use GIT open source for this purpose. Or do I have to
 buy GIT to keep my projects confidential. I need a revision control system
 to run in 10 to 15 work station. There is no need of any web base sharing.

 Please, help me in this regard as quickly as possible.

 Regards
 Lakshmi KV




 --
 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/d/optout.




-- 
Nelson Efrain A. Cruz - https://plus.google.com/106845325502523605960/about

Debes ser el cambio que esperas ver en el mundo -Mahatma Gandhi

-- 
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/d/optout.

Re: [git-users] documentation for bfg

2014-05-01 Thread Nelson Efrain A. Cruz

I didn't found any other documentation, only the website.

Anyway the help command it's very helpful.


2014-05-01 15:38 GMT-03:00 joeriel...@gmail.com:

 Is there any documentation for bfg? There are a couple examples on the
 home page, http://rtyley.github.io/bfg-repo-cleaner/,
 but I woudn't call that real documentation.

 --
 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/d/optout.




-- 
Nelson Efrain A. Cruz - https://plus.google.com/106845325502523605960/about

Debes ser el cambio que esperas ver en el mundo -Mahatma Gandhi

-- 
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/d/optout.

Re: [git-users] Creating a new branch

2014-04-22 Thread Nelson Efrain A. Cruz

Take a look (if you did not yet) at this two articles:

1- http://scottchacon.com/2011/08/31/github-flow.html
2- http://nvie.com/posts/a-successful-git-branching-model/


2014-04-22 3:20 GMT-03:00 Gergely Polonkai gerg...@polonkai.eu:

 Another common practise for release naming is the usage of tags. In my
 projects, for example, I have several tags like v1.0.0, v2.4.2 and such.
 On 21 Apr 2014 14:53, Simon Joseph Aquilina saquilina...@gmail.com
 wrote:

 Hi Konstantin,

 Thanks for your reply. Reading your reply make me think that it is common
 practice to delete branches after development on these has finished (for
 example branches used only to solve a bug or add a feature). Is this so.
 I was planning to also have branches for releases. For example when I am
 at release 1.0 I create a branch and then I continue development on master.
 When I am ready for 2.0 release I create another branch and so on. Is this
 common practice? Or version mile stone should not be managed this way?




 On Monday, April 21, 2014 12:23:31 PM UTC+2, Konstantin Khomoutov wrote:

 On Mon, 21 Apr 2014 02:55:50 -0700 (PDT)
 Simon Joseph Aquilina saquil...@gmail.com wrote:

  I am new to git and I would like to know what are the best practices
  when creating a new branch. For example. If I get a request to do
  update website title from XYZ to ABC; then should I create a branch
  named; Update Title? Or I should prefix this as suggested here
  (http://stackoverflow.com/questions/273695/git-branch-
 naming-best-practices).
  Are there any official prefixes?
 
  Also I am concerned about the following;
 
  Let us say I create the branch named Update Title. Finish the
  change. Merge back with Master. I then get another request to change
  title from ABC to DEF. Can I create another branch Update Title.
  Will not this be confusing?

 In Git, a branch is merely a pointer to a commit.  The crucial bit is
 pointer -- this means any commit might be pointed to by any number of
 branches at the same time, and that's why commits do not belong to
 any branch.  Hence whatever meaning you put into a branch name is only
 in your head -- this does not affect commits reachable from that branch
 in any way.  Moreover, once you merge a branch into another, and
 subsequently delete the merged branch, the commits made on it stay
 there forever while there's no more traces left of the deleted branch --
 as if it had never existed.

 So, do whatever you want with your branches.  Giving your branches
 names like Update Title is not a common practice but for purely
 technical reason: in Git, a branch is represented by a file on a
 filesystem, and using branch names with funny characters, spaces
 included might, in some situations, cause problems.  So I'd name your
 branch update-title -- that is, no title casing, no spaces.

 Another popular approach is to put your bug tracker / ticketing system
 first: when you're given a task to update the site's title, open a bug
 for this first and get that bug's ID back, then simply encode the bug's
 title into the branch name, like bug-12345.  This will give you
 unique branch names.  When you merge you branch back to the integration
 branch you mention the bug's ID in the commit message and then close
 the bug in the tracker.

 Note that Git has certain means to attach metadata to your branches.
 Two of them that I know of are

 * `git branch --edit-description` which allows you to set a description
   of the purpose of that branch.  This description is used by some other
   Git tools but you can print it back using the `git config` command:

 git config branch.bug-12345.description

 * `git notes` allows you to attach a note to any commit.  Notes are not
   pushed by default (and supposedly the shouldn't be, unless everyone in
   the team agrees to do that as they were supposed to be used locally).

  --
 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/d/optout.

  --
 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/d/optout.




-- 
Nelson Efrain A. Cruz - https://plus.google.com/106845325502523605960/about

Debes ser el cambio que esperas ver en el mundo -Mahatma Gandhi

-- 
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/d/optout.

Re: [git-users] Change branch creation point of a topic branch after it has been created?

2014-04-08 Thread Nelson Efrain A. Cruz

Hi, you can create a new branch starting on masterF, then you can rebase
it:

git checkout topic #you must be in your topic branch
git branch temp-branch masterF #create a branch starting in your F commit
git rebase temp-branch #Reaply your commits over your temp branch
git branch -d temp-branch #Delete the temp branch

Maybe you can try this in a copy of your repo, just in case,  rebase can be
dangerous, you will be rewriting history.  Also if you are working with
others in the same repo, you will run in troubles if you rewrite history
that was already shared.


2014-04-08 10:08 GMT-03:00 Alex Rodrigues rodrigues.a...@gmail.com:

 I have a git repository with a master branch and a topic branch (created
 at master'B) and the topic branch has received some merges from master.

 A - B - D - F - H- master branch
  \   \
   C - E - G  - topic branch

 Is it possible to changed the point on master at which the topic branch
 was created from master'B to master'F?

 --
 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/d/optout.




-- 
Nelson Efrain A. Cruz - https://plus.google.com/106845325502523605960/about

Debes ser el cambio que esperas ver en el mundo -Mahatma Gandhi

-- 
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/d/optout.

Re: [git-users] git showing modified files right after branch chekout

2014-04-03 Thread Nelson Efrain A. Cruz

Perhaps it's a problem with git for Windows. I run in a, somehow, similar
situation using git for windows: in a branch, say branch-one, I have files
that didn't exists in branch-two. So changing from branch-one to branch-two
will result in all of these files that didn't exists in branch-two showing
up like untracked files.

Maybe you can try asking in the group for msysGit[1]

[1] = https://groups.google.com/forum/#!forum/msysgit

El abr 2, 2014 8:40 AM, Stas Fedotov stas.fedo...@gmail.com escribió:

 Hi!

 I have pretty much strange situation. Working on Windows machine and
 committing to Git Stash.

 In my global config I have core.autocrlf=true and there is .gitattributesin 
 repo with *
 text = auto

 Now here is what I do on clean, recently cloned repo:

 git status #1on develop, no changes

 git checkout -t origin/BRANCH-1  git status #2
 Branch BRANCH-1 set up to track remote branch GPIII-96 from origin.
 Switched to a new branch 'BRANCH-1'
 modified: A.java
 modified: B.java
 modified: C.java

 file A.java
 A.java: ASCII text, with CRLF line terminators

 git rm --cached -r .  git reset --hard  git status
 # On branch BRANCH-1
 nothing to commit (working directory clean)
 **WTF??**

 git checkout develop -f  git status
 modified: D.java
 **WTF???* **#remember on #1 it was OK*

 git checkout BRANCH-1 -f  git status
 modified: A.java
 modified: B.java
 modified: C.java
 **WTF???**


 I am really not sure if it is connected to line-endings. I just have no
 idea how to check it.

 Any ideas on what's going on and how to fix that?

 --
 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/d/optout.


-- 
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/d/optout.

Re: [git-users] Clone thinks origin has a removed branch

2014-03-31 Thread Nelson Efrain A. Cruz

Hi, i think that prune it's what you are asking for, just like Konstantin
explain to you: it removes locals refs to remotes branches that no longer
exists, once they are removed they will not appear in your repo.


2014-03-31 1:19 GMT-03:00 Fredrik Linder fredrikelin...@gmail.com:


 'git remote prune origin' removes local branches -- that's not my issue
 :-) Thank you though.

 My issue is that my local repo (clone1) has an incorrect view of my remote
 (origin), and I don't know to fix that -- beside messing with the internals
 or re-cloning it.
 Besides, this happens regardless if I have a local branch tracking the
 remote branch or not.

 I thought 'git fetch' (or any of the other previously mentioned commands)
 was supposed to do that, but it doesn't.

 /Fredrik

 --
 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/d/optout.




-- 
Nelson Efrain A. Cruz - https://plus.google.com/106845325502523605960/about

Debes ser el cambio que esperas ver en el mundo -Mahatma Gandhi

-- 
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/d/optout.

Re: [git-users] Re: git clone a directory into a new local directory with a new name

2014-03-26 Thread Nelson Efrain A. Cruz

If you can't find a solution maybe you can try in [1], the problem seems to
be specific to Windows and also you need to learn basics commands to play
around in a terminal, think that when you are in git shell you are in a
emulated *nix terminal

[1] = https://groups.google.com/forum/#!forum/msysgit
El mar 26, 2014 3:51 AM, Gergely Polonkai gerg...@polonkai.eu escribió:

Try removing the directory with rmdir newDirectory (without git). If
that fails, newDirectory is obviously not empty. In that case you should
check the contents of the dir with ls -la newDirectory, and/or remove it
with rm -rf newDirectory.

Cheers,
Gergely

On 26 March 2014 02:00, Michael Laird michael.w.la...@gmail.com wrote:

I don't have the problem solved, but here is more information, and maybe
a more targeted question.

I tried to remove the thing Git calls newProject with the command rm -f
newProject
I get rm: 'newProject' is a directory

I read that directories can be removed with this command git rm -r
--cached newProject
I get fatal: Not a repository (or any of the parent directories): .git

So maybe newProject is an empty directory. As I posted above, it has 0 in
its description. Maybe that is 0 bytes.

I read elsewhere that empty directories cannot be removed. There is no
such command in git.

If that is true, how do I make newProject a non-empty directory, and
then remove it - the whole thing?

On Tuesday, March 25, 2014 4:32:15 PM UTC-4, Michael Laird wrote:

In Nelson's first response, he suggested doing some ls commands, and I
just remembered that.
When pointing to the htdocs directory, and I do ls -la
I get - several responses listing directories and files, plus I get 2
things refering to my first attempts last week. They seem to be
directories as Git sees them (drwxr-xr-x appears for other directories that
I can see in Windows Explorer), but they are not visible in Windows
Explorer, even with hidden files made visible. They look like:
drwxr-xr-x 4 UserName Administ 0 Mar 17 newProject
drwxr-xr-x 2 UserName Administ 0 Mar 18 newProject1

When I do ls -la newProject
I get similar things in the 'imaginary' newProject directory, looking
like:
drwxr-xr-x 13 UserName Administ 0 Mar 17 newProject
drwxr-xr-x 1 UserName Administ 0 Mar 18 angular-seed

So this explains why I get the error message - fatal: destination path
'newProject' already exists . . .

What are these things that only git is seeing? How do I get rid of
them? I just did a new install.

On Monday, March 24, 2014 2:17:35 PM UTC-4, Michael Laird wrote:

I want to clone a directory of files to start my first AngularJS
project and put those files in Apache's htdocs directory with the name of
my project, e.g., newProject. I've used the ProGit book, a bunch of
tutorials, and Stackoverflow, and after many hours, still don't have it.

From all my first attempt messing around, I may have 'polluted' my git.
With no newProject directory in the htdocs directory (ie, after deleting
prior copies), I point git at htdocs and get a command prompt ending in
htdocs. There, I can do a cd newProjects and get a new command prompt
ending in htdocs/newProject, even though the directory does not exist. A
git status returns fatal:not a git repo (or any of parent directories):
.git I have tried rm -rf .git at that prompt and get no git response, just
another same commmand prompt. What's going on? I have recently deleted git,
and re-installed a new download, so maybe this is no longer an issue.

When I add a newProject directory to htdocs and do what ProGit says

git clone git://github.com/angular/angular-seed.git newProject

I get fatal:destination path newProject exists and is not empty, even
though Windows Explorer says it is an empty directory, and a git status at
that prompt says fatal:not a repo (. . .) .git

When I try the commands at How do you clone a git repository into a
specific
folder?http://stackoverflow.com/questions/651038/how-do-you-clone-a-git-repository-into-a-specific-folderas
follows

git clone git://github.com/angular/angular-seed:newProject htdocs

I get fatal:destination path newProject exists and is not empty A git
status at that prompt returns fatal: not a repository

I have also tried the above command without the htdocs, and get the
same result.

Now that I have re-installed a new download of git, I need to do a
correct command to clone the angular-seed directory of files and get it
renamed newProject in a directory several levels down in Windows7, called
apache2/htdos. What do I do?

--
You received this message because you are subscribed to the Google Groups
Git for

Re: [git-users] git clone a directory into a new local directory with a new name

2014-03-24 Thread Nelson Efrain A. Cruz

the command

git clone git://github.com/angular/angular-seed.git newProject

its correct, i can only assume that you are having problems with
positioning in the folders so maybe thats is the problem. Anyway, i think
you are using git bash, so you can try to run ls -la in the htdocs
directory to se what the git bash is seeing, also in the same folder you
can try ls -la newProject/ to see if there is somethin inside.

Maybe you can give a try to the Git GUI or SourceTree (another GUI) from
atlassian, but it's better to learn git from the command line first, so
it's up to you.

And also you can clone the repository in any folder and then you can move
the folder to anywhere, lets say in your htdocs folder. In the prompt of
git bash the default folder is c:\Users\your_user\

2014-03-24 15:17 GMT-03:00 Michael Laird michael.w.la...@gmail.com:

I want to clone a directory of files to start my first AngularJS project
and put those files in Apache's htdocs directory with the name of my
project, e.g., newProject. I've used the ProGit book, a bunch of tutorials,
and Stackoverflow, and after many hours, still don't have it.

When I add a newProject directory to htdocs and do what ProGit says

git clone git://github.com/angular/angular-seed.git newProject

I get fatal:destination path newProject exists and is not empty, even
though Windows Explorer says it is an empty directory, and a git status at
that prompt says fatal:not a repo (. . .) .git

When I try the commands at How do you clone a git repository into a
specific
folder?http://stackoverflow.com/questions/651038/how-do-you-clone-a-git-repository-into-a-specific-folderas
follows

git clone git://github.com/angular/angular-seed:newProject htdocs

I get fatal:destination path newProject exists and is not empty A git
status at that prompt returns fatal: not a repository

I have also tried the above command without the htdocs, and get the same
result.

Now that I have re-installed a new download of git, I need to do a correct
command to clone the angular-seed directory of files and get it renamed
newProject in a directory several levels down in Windows7, called
apache2/htdos. What do I do?

--
Nelson Efrain A. Cruz - https://plus.google.com/106845325502523605960/about

Debes ser el cambio que esperas ver en el mundo -Mahatma Gandhi

--
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/d/optout.

Re: [git-users] git clone a directory into a new local directory with a new name

2014-03-24 Thread Nelson Efrain A. Cruz

You're welcome.

Well you don't need to create any folder, the command will create it, if
the folder already exists and it's not empty, the command will fail (the
repository will not be created) but if it's empty there are no trouble.

With git clone you always create a new folder that contains the repo, in
your case if you are in htdocs the repository will be in newProject, so to
run git status you need to be inside newProject.

2014-03-24 16:52 GMT-03:00 Michael Laird michael.w.la...@gmail.com:

Nelson,
Thank you, this is helpful to understand some things.
Do I make the newProject directory under htdocs before the git clone
command, or does the git clone command with the newProject at the end make
the directory?
When I make the git clone command with newProject, as posted, which
directory should I have Git Bash pointing to - htdocs or newProject (under
htdocs)?

On Monday, March 24, 2014 3:07:58 PM UTC-4, Nelson Efrain A. Cruz wrote:

the command

git clone git://github.com/angular/angular-seed.git newProject

Maybe you can give a try to the Git GUI or SourceTree (another GUI) from
atlassian, but it's better to learn git from the command line first, so
it's up to you.

And also you can clone the repository in any folder and then you can move
the folder to anywhere, lets say in your htdocs folder. In the prompt of
git bash the default folder is c:\Users\your_user\

2014-03-24 15:17 GMT-03:00 Michael Laird michael...@gmail.com: