Re: [git-users] Just getting started

[Chris Stone]

 -m "initial commit" works with cmd.exe powershell, git bash and linux
which is why I suggested it. As I do not have access to a mac I am unable
to say if it will work on a mac or not. Considering the origins of darwin I
believe it will work on mac as well.

On Sat, Jul 15, 2023 at 12:13 AM Tassilo Horn  wrote:

> Chris Stone  writes:
>
> Hi Chris,
>
> > I have always used double quotes for commit msgs. git commit -m
> > "message here" I also believe that is the expected format when using
> > -m
>
> That's not git's responsibility.  -m wants gets a single argument but
> what that is depends on how your shell interprets what you've typed in
> on the command line.  That said, -m "initial commit" might be the right
> string quoting for cmd.exe.  With typical unix/posix shells, usually any
> of
>
>   -m "initial commit"
>   -m 'initial commit'
>   -m initial\ commit
>
> will ensure that "initial commit" is interpreted as a single argument
> instead of two.
>
> Bye,
> Tassilo
>
> --
> 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.
> To view this discussion on the web visit
> https://groups.google.com/d/msgid/git-users/878rbhpurv.fsf%40gnu.org.
>

-- 
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.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/git-users/CAEHZf3Zozg3UHz-Lw6fwNvMXUuunpX8GgrvSWp4X_tdt8RTEfQ%40mail.gmail.com.

Re: [git-users] Just getting started

[Chris Stone]

I have always used double quotes for commit msgs. git commit -m "message
here" I also believe that is the expected format when using -m

On Fri, Jul 14, 2023 at 8:50 AM Tassilo Horn  wrote:

> David Aldrich  writes:
>
> Hi David,
>
> > I am at the absolute beginning of learning git. Using git on Windows.
> > I have done:
> >
> >>git init
> >>git add *.cpp
> >>git status
> > On branch master
> >
> > No commits yet
> >
> > Changes to be committed:
> >   (use "git rm --cached ..." to unstage)
> > new file:   file_A.cpp
> > new file:   file_B.cpp
> >
> >>git commit -m 'initial files'
> > error: pathspec 'files'' did not match any file(s) known to git
> >
> > Why is this failing?
>
> What shell are you using?  The above error suggests that the quoted
> string 'initial files' is interpreted as two arguments 'initial and
> files'.
>
> IIRC, Git for windows comes with git-bash which is a proper unix shell
> which probably also has completion for git commands.  In case you have
> to stick to the shell you are using right now, you need to figure out
> how to properly quote strings containing spaces...
>
> Bye,
> Tassilo
>
> --
> 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.
> To view this discussion on the web visit
> https://groups.google.com/d/msgid/git-users/87ilamzgvx.fsf%40gnu.org.
>

-- 
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.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/git-users/CAEHZf3Ytf1WgQOnyTvu19w645GsSGqv7zMwoiVs9TXKSaNsyvQ%40mail.gmail.com.

Re: [git-users] git pull --no-ff is not equivalent to git fetch+merge

[Chris Stone]

from https://git-scm.com/docs/git-config

pull.ff

   By default, Git does not create an extra merge commit when merging a
   commit that is a descendant of the current commit. Instead, the tip
   of the current branch is fast-forwarded. When set to |false|, this
   variable tells Git to create an extra merge commit in such a case
   (equivalent to giving the |--no-ff| option from the command line).
   When set to |only|, only such fast-forward merges are allowed
   (equivalent to giving the |--ff-only| option from the command line).
   This setting overrides |merge.ff| when pulling.

if you run git config pull.ff false a git pull will always default to a 
merge commit. Use git config --global to set system wide


On 7/10/23 12:01, Uwe Brauer wrote:

"KK" == Konstantin Khomoutov  writes:

On Mon, Jul 10, 2023 at 06:30:04PM +0200, Uwe Brauer wrote:

While in mercurial «hg fetch» is equivalent to «hg pull» and «hg merge»

it seems that «git pull --no-ff» is not equivalent to
«git fetch» and «git merge».

This might be wrong expectations.
I'll try to explain in simple words.



In a VCS which uses cryptographic hashes to refer to commits, a line of
history may be fully contained in another, say
   A --> B --> C --> D
fully contains
   A --> B
and
   A --> B --> C
but not, for instance,
   A --> B --> X



A branch fully contained in some other branch is said to be eligible for
fast-forwarding to that containing (enclosing) branch. Why is that?
Because if we, say, have that A --> B line of commits on some branch,
and want that branch to now become A --> B --> C --> D, there's no real need
to _actually merge_ that C --> D bit: we can instead just update the branch to
point directly at D, with not merge commit involved.



Git defaults to this fast-forward behavior in every place merging is involved,
and `git pull` is one of such places.

So far I had assumed.


Going back to our example, if you locally have your "master" to
contain A --> B, and "master" in the remote repo contains A --> B -->
C --> D, pulling from that branch will by default to a fast-forward
merge.



The "--no-ff" command-line option for `git pull` is actually
passed by that command to `git merge` it eventually calls, and forces
the latter to not do a fast-forward and instead record a true merge,
resulting in a merge commit recorded, which has two parents: B and D.

But that is where my confusing starts I used the "--no-ff" option and
nevertheless git performed (at least the graphs looks to me like that)
a fast forward.


Is there no way to configure pull that it produces the same graph, as
git fetch+merge?

Mercurial seems to do that and I will ask some mercurial guru how it
does 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.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/git-users/bfefb680-d434-4ae4-7eab-f036ffb1edbf%40gmail.com.

Re: [git-users] Need help....locked out

[Chris Stone]

If you can access the account on your phone. Make the repo public create a
new GitHub user account and fork the original repo.

On Sun, Jan 2, 2022, 4:20 PM robert kugler  wrote:

> Thanks for the input everyone.I think I am SOL on recovering my
> account because I cant log in to change the ssg keys, all of my passwords
> were distroyed when the old computer died, and github support has not
> responded for over a week. I cant find a phone number to bug them, but as
> they say, they may not be able to help. The recovery keys provided when I
> made the account were lost on the old computer and I think I may be duels
> FU***D.
> one question is: I still have access to that account through my phone, and
> I can even view the files on the phone, but I cant find a way to email the
> file from my phone. I cant seem to do a full file copy and paste into an
> email, but I am probably missing something. Does anyone know how to do that
> on an android phone?
> Thanks,
> Bob
>
> On Sunday, January 2, 2022 at 5:02:34 PM UTC-5 Chris Stone wrote:
>
>> Robert would not need ssh to access the main account. That would be
>> handled by the 2fa which is where his problem is. The ssh is dealing only
>> with the actual git repo
>>
>> On Sun, Jan 2, 2022, 1:06 PM Philip Oakley  wrote:
>>
>>> The main question to Robert, is whether he can access his general GitHub
>>> account via a web browser. My expectation was that login step did not need
>>> ssh.
>>>
>>> If Robert can login to his account (Confirmation needed), then he can
>>> update/replace his ssh keys (generate new ones).
>>>
>>> On Sunday, January 2, 2022 at 6:49:48 PM UTC Chris Stone wrote:
>>>
>>>> On my phone so I can't include links easily. However I used the link
>>>> provided earlier and went to 2fa under authentication. Even on the about
>>>> 2fa and recovery articles it states due to security concerns GitHub support
>>>> may not be able to help
>>>>
>>>> On Sun, Jan 2, 2022, 11:19 AM Philip Oakley 
>>>> wrote:
>>>>
>>>>> I thought that the basic Github login (password and 2FA codes) was
>>>>> separate from the ssh key stuff.
>>>>>
>>>>> There is a support page link
>>>>> <https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/reviewing-your-ssh-keys>
>>>>> on managing ssh keys suggesting that you could delete all old or
>>>>> compromised keys down to zero active keys, and start afresh with new ssh
>>>>> keys, but I could be mistaken (off by one..).
>>>>>
>>>>> Did you get (download) any recovery codes in the past... and still
>>>>> have them available.. ?
>>>>>
>>>>> I'd contact GitHub support before you get doubly locked out by trying
>>>>> too hard to look like someone hacking in ;-)
>>>>>
>>>>> On Sunday, January 2, 2022 at 5:32:04 AM UTC Chris Stone wrote:
>>>>>
>>>>>> Never used 2fa on GitHub. However it does make sense. I do know you'd
>>>>>> have to generate a new ssh key before you can access your repo via ssh
>>>>>> since you lost the old one
>>>>>>
>>>>>> On Sat, Jan 1, 2022, 10:02 PM robert kugler 
>>>>>> wrote:
>>>>>>
>>>>>>> As a newbie to git, i am having trouble getting in to my github
>>>>>>> account.
>>>>>>> I have had a majoe computer hardware failure, and had to build a new
>>>>>>> computer with ubuntu 20.
>>>>>>> I have lost my github password, and the private ssh key from the old
>>>>>>> computer is gone.
>>>>>>> I try to log into github using firefox V95.0.1.
>>>>>>> I click "forgot password" on github and get an email link to reset
>>>>>>> my password.
>>>>>>> when I get a password reset email from GitHub, the 2FA requires a
>>>>>>> validation code.
>>>>>>> I have a github authentication app on my phone, and it does give me
>>>>>>> a nvalidation code, but that code does not ever work.
>>>>>>> I am wondering if it has something to do wirh my using a freshly
>>>>>>> rebuilt system, which may not have the same ssh key as the old system, 
>>>>>>> but
>>>>>>> I am not sure.
>>>>>>>

Re: [git-users] Need help....locked out

[Chris Stone]

Robert would not need ssh to access the main account. That would be handled
by the 2fa which is where his problem is. The ssh is dealing only with the
actual git repo

On Sun, Jan 2, 2022, 1:06 PM Philip Oakley  wrote:

> The main question to Robert, is whether he can access his general GitHub
> account via a web browser. My expectation was that login step did not need
> ssh.
>
> If Robert can login to his account (Confirmation needed), then he can
> update/replace his ssh keys (generate new ones).
>
> On Sunday, January 2, 2022 at 6:49:48 PM UTC Chris Stone wrote:
>
>> On my phone so I can't include links easily. However I used the link
>> provided earlier and went to 2fa under authentication. Even on the about
>> 2fa and recovery articles it states due to security concerns GitHub support
>> may not be able to help
>>
>> On Sun, Jan 2, 2022, 11:19 AM Philip Oakley  wrote:
>>
>>> I thought that the basic Github login (password and 2FA codes) was
>>> separate from the ssh key stuff.
>>>
>>> There is a support page link
>>> <https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/reviewing-your-ssh-keys>
>>> on managing ssh keys suggesting that you could delete all old or
>>> compromised keys down to zero active keys, and start afresh with new ssh
>>> keys, but I could be mistaken (off by one..).
>>>
>>> Did you get (download) any recovery codes in the past... and still have
>>> them available.. ?
>>>
>>> I'd contact GitHub support before you get doubly locked out by trying
>>> too hard to look like someone hacking in ;-)
>>>
>>> On Sunday, January 2, 2022 at 5:32:04 AM UTC Chris Stone wrote:
>>>
>>>> Never used 2fa on GitHub. However it does make sense. I do know you'd
>>>> have to generate a new ssh key before you can access your repo via ssh
>>>> since you lost the old one
>>>>
>>>> On Sat, Jan 1, 2022, 10:02 PM robert kugler  wrote:
>>>>
>>>>> As a newbie to git, i am having trouble getting in to my github
>>>>> account.
>>>>> I have had a majoe computer hardware failure, and had to build a new
>>>>> computer with ubuntu 20.
>>>>> I have lost my github password, and the private ssh key from the old
>>>>> computer is gone.
>>>>> I try to log into github using firefox V95.0.1.
>>>>> I click "forgot password" on github and get an email link to reset my
>>>>> password.
>>>>> when I get a password reset email from GitHub, the 2FA requires a
>>>>> validation code.
>>>>> I have a github authentication app on my phone, and it does give me a
>>>>> nvalidation code, but that code does not ever work.
>>>>> I am wondering if it has something to do wirh my using a freshly
>>>>> rebuilt system, which may not have the same ssh key as the old system, but
>>>>> I am not sure.
>>>>> Can anyone help me with this?
>>>>> Thanks,
>>>>> Bob
>>>>>
>>>>> --
>>>>> 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.
>>>>> To view this discussion on the web visit
>>>>> https://groups.google.com/d/msgid/git-users/62a84b7d-628e-4145-88b0-49f45f3d715cn%40googlegroups.com
>>>>> <https://groups.google.com/d/msgid/git-users/62a84b7d-628e-4145-88b0-49f45f3d715cn%40googlegroups.com?utm_medium=email_source=footer>
>>>>> .
>>>>>
>>>> --
>>> 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.
>>>
>> To view this discussion on the web visit
>>> https://groups.google.com/d/msgid/git-users/0e72150d-b269-4cbf-88ca-6224768d62b2n%40googlegroups.com
>>> <https://groups.google.com/d/msgid/git-users/0e72150d-b269-4cbf-88ca-6224768d62b2n%40googlegroups.com?utm_medium=email_source=footer>
>>> .
>>>
>> --
> 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.
> To view this discussion on the web visit
> https://groups.google.com/d/msgid/git-users/2f99536f-a7ef-42db-9197-aaaccdee8b8en%40googlegroups.com
> <https://groups.google.com/d/msgid/git-users/2f99536f-a7ef-42db-9197-aaaccdee8b8en%40googlegroups.com?utm_medium=email_source=footer>
> .
>

-- 
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.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/git-users/CAAhEApaVGDYKo0g%3D9SMKNmbhBvL1djRt18jBLs9knrEwT%2BqcDg%40mail.gmail.com.

Re: [git-users] Need help....locked out

[Chris Stone]

On my phone so I can't include links easily. However I used the link
provided earlier and went to 2fa under authentication. Even on the about
2fa and recovery articles it states due to security concerns GitHub support
may not be able to help

On Sun, Jan 2, 2022, 11:19 AM Philip Oakley  wrote:

> I thought that the basic Github login (password and 2FA codes) was
> separate from the ssh key stuff.
>
> There is a support page link
> <https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/reviewing-your-ssh-keys>
> on managing ssh keys suggesting that you could delete all old or
> compromised keys down to zero active keys, and start afresh with new ssh
> keys, but I could be mistaken (off by one..).
>
> Did you get (download) any recovery codes in the past... and still have
> them available.. ?
>
> I'd contact GitHub support before you get doubly locked out by trying too
> hard to look like someone hacking in ;-)
>
> On Sunday, January 2, 2022 at 5:32:04 AM UTC Chris Stone wrote:
>
>> Never used 2fa on GitHub. However it does make sense. I do know you'd
>> have to generate a new ssh key before you can access your repo via ssh
>> since you lost the old one
>>
>> On Sat, Jan 1, 2022, 10:02 PM robert kugler  wrote:
>>
>>> As a newbie to git, i am having trouble getting in to my github account.
>>> I have had a majoe computer hardware failure, and had to build a new
>>> computer with ubuntu 20.
>>> I have lost my github password, and the private ssh key from the old
>>> computer is gone.
>>> I try to log into github using firefox V95.0.1.
>>> I click "forgot password" on github and get an email link to reset my
>>> password.
>>> when I get a password reset email from GitHub, the 2FA requires a
>>> validation code.
>>> I have a github authentication app on my phone, and it does give me a
>>> nvalidation code, but that code does not ever work.
>>> I am wondering if it has something to do wirh my using a freshly rebuilt
>>> system, which may not have the same ssh key as the old system, but I am not
>>> sure.
>>> Can anyone help me with this?
>>> Thanks,
>>> Bob
>>>
>>> --
>>> 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.
>>> To view this discussion on the web visit
>>> https://groups.google.com/d/msgid/git-users/62a84b7d-628e-4145-88b0-49f45f3d715cn%40googlegroups.com
>>> <https://groups.google.com/d/msgid/git-users/62a84b7d-628e-4145-88b0-49f45f3d715cn%40googlegroups.com?utm_medium=email_source=footer>
>>> .
>>>
>> --
> 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.
> To view this discussion on the web visit
> https://groups.google.com/d/msgid/git-users/0e72150d-b269-4cbf-88ca-6224768d62b2n%40googlegroups.com
> <https://groups.google.com/d/msgid/git-users/0e72150d-b269-4cbf-88ca-6224768d62b2n%40googlegroups.com?utm_medium=email_source=footer>
> .
>

-- 
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.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/git-users/CAAhEApb%2BpdJiqzE9Y8JGu-3KKvWbcvOeeBcjLCpuPScvjYSS%2Bg%40mail.gmail.com.

Re: [git-users] Need help....locked out

[Chris Stone]

This is why I tend to stay away from 2fa. From my experience either you
remember your password and keep the recovery key provided when first
setting up the 2fa just in case or your out of luck. Even tech support is
unable to help.
On Sun, Jan 2, 2022, 11:19 AM Philip Oakley  wrote:

> I thought that the basic Github login (password and 2FA codes) was
> separate from the ssh key stuff.
>
> There is a support page link
> <https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/reviewing-your-ssh-keys>
> on managing ssh keys suggesting that you could delete all old or
> compromised keys down to zero active keys, and start afresh with new ssh
> keys, but I could be mistaken (off by one..).
>
> Did you get (download) any recovery codes in the past... and still have
> them available.. ?
>
> I'd contact GitHub support before you get doubly locked out by trying too
> hard to look like someone hacking in ;-)
>
> On Sunday, January 2, 2022 at 5:32:04 AM UTC Chris Stone wrote:
>
>> Never used 2fa on GitHub. However it does make sense. I do know you'd
>> have to generate a new ssh key before you can access your repo via ssh
>> since you lost the old one
>>
>> On Sat, Jan 1, 2022, 10:02 PM robert kugler  wrote:
>>
>>> As a newbie to git, i am having trouble getting in to my github account.
>>> I have had a majoe computer hardware failure, and had to build a new
>>> computer with ubuntu 20.
>>> I have lost my github password, and the private ssh key from the old
>>> computer is gone.
>>> I try to log into github using firefox V95.0.1.
>>> I click "forgot password" on github and get an email link to reset my
>>> password.
>>> when I get a password reset email from GitHub, the 2FA requires a
>>> validation code.
>>> I have a github authentication app on my phone, and it does give me a
>>> nvalidation code, but that code does not ever work.
>>> I am wondering if it has something to do wirh my using a freshly rebuilt
>>> system, which may not have the same ssh key as the old system, but I am not
>>> sure.
>>> Can anyone help me with this?
>>> Thanks,
>>> Bob
>>>
>>> --
>>> 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.
>>> To view this discussion on the web visit
>>> https://groups.google.com/d/msgid/git-users/62a84b7d-628e-4145-88b0-49f45f3d715cn%40googlegroups.com
>>> <https://groups.google.com/d/msgid/git-users/62a84b7d-628e-4145-88b0-49f45f3d715cn%40googlegroups.com?utm_medium=email_source=footer>
>>> .
>>>
>> --
> 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.
> To view this discussion on the web visit
> https://groups.google.com/d/msgid/git-users/0e72150d-b269-4cbf-88ca-6224768d62b2n%40googlegroups.com
> <https://groups.google.com/d/msgid/git-users/0e72150d-b269-4cbf-88ca-6224768d62b2n%40googlegroups.com?utm_medium=email_source=footer>
> .
>

-- 
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.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/git-users/CAAhEApb4qwwdG78Cws%3D_Z7fhXxLMncj3AXYbuc41a%2BLRPHjgrQ%40mail.gmail.com.

Re: [git-users] Need help....locked out

[Chris Stone]

Never used 2fa on GitHub. However it does make sense. I do know you'd have
to generate a new ssh key before you can access your repo via ssh since you
lost the old one

On Sat, Jan 1, 2022, 10:02 PM robert kugler  wrote:

> As a newbie to git, i am having trouble getting in to my github account.
> I have had a majoe computer hardware failure, and had to build a new
> computer with ubuntu 20.
> I have lost my github password, and the private ssh key from the old
> computer is gone.
> I try to log into github using firefox V95.0.1.
> I click "forgot password" on github and get an email link to reset my
> password.
> when I get a password reset email from GitHub, the 2FA requires a
> validation code.
> I have a github authentication app on my phone, and it does give me a
> nvalidation code, but that code does not ever work.
> I am wondering if it has something to do wirh my using a freshly rebuilt
> system, which may not have the same ssh key as the old system, but I am not
> sure.
> Can anyone help me with this?
> Thanks,
> Bob
>
> --
> 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.
> To view this discussion on the web visit
> https://groups.google.com/d/msgid/git-users/62a84b7d-628e-4145-88b0-49f45f3d715cn%40googlegroups.com
> 
> .
>

-- 
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.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/git-users/CAAhEApbDR1YphMgXALj37BTczgQQtk2Tj5Bd7eeRUNDLjwkGgQ%40mail.gmail.com.

Re: [git-users] How to save file's first commit, but ignore all further changes to this file?

[Chris Stone]

I think you could check in the "header files" as you want them to be 
then add the files to your .gitignore that way any changes made to those 
header files would not be committed to the repo. Another option I think 
would work which might be the better solution is to use a git hook to 
copy the empty header files to the working directory after checkout.


On 1/6/2016 12:39 PM, Tikhon Tarnavsky wrote:
I have some "data batches" inside my project. These batches are in a 
binary proprietary format, and I don't need to save their content into 
the repo. User can add a files to a batch using an external binary 
utility. But every batch should have some "batch header" files (binary 
also, but very small for the empty batch - a couple of bytes). I put 
the "header files" into my repo, so any user will have a correct 
"empty batch" after clone. But then she needs to work with this batch 
- add some files, etc. Files inside a batch is in my .gitignore, but 
now a user needs to empty a batch before every commit, or to select 
files manually, excluding the "batch header" files. If she will forget 
to exclude header files, the next user can get a broken batch, with 
"non-empty" header, but without any files. A files inside a batch 
shouldn't be in the repo not only because of the big size - it can 
contain some confidential information. I want any user to get the 
empty batch header files for every new batch I add, but not to push 
any new versions of these files.


2016-01-06 21:13 GMT+02:00 Gergely Polonkai >:


There is an assume-unchanged option you can set with
git-update-index, but that's for your local repository only; it is
possible that other developers will overwrite the file.

If you tell us some more details, the list may give you better
answers or alternatives, though.

Best,
Gergely

On 6 Jan 2016 19:05, "Tikhon Tarnavsky"
>
wrote:

Hi all,

I need to save some file in my git repo in it's current state,
ignoring all changes to it forever. Any suggestions?
-- 
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 a topic in

the Google Groups "Git for human beings" group.
To unsubscribe from this topic, visit
https://groups.google.com/d/topic/git-users/gq5rg-AA95c/unsubscribe.
To unsubscribe from this group and all its topics, 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] Strict, domain-based read/write vs. read-only access.

[Chris Stone]

Have you looking into using a dedicated server package such as gitosis 
or gitolite? I know github also has a version of there software 
available as well.


Sounds like a solution similar to what is used on drupal.org might work 
for your needs.


Any one can clone a project from drupal.org using git clone 
http://git.drupal.org/project/"name or repo" however only users that 
have ssh access and have been giving commit rights to a project can 
commit to the repository since drupal.org using ssh access to push any 
changes up to there project repos.


On 1/6/2016 10:31 AM, David Barr wrote:

Good Morning,

I need to pitch an Enterprise level code management system. This 
system needs to have some fairly strict read-only vs. read/write 
requirements based on environment.


I first asked this question in Stack Overflow 
, 
but I need to flesh out additional details...


Posit three environments identified by their subdomains: 
DEV.example.com, TEST.example.com, and PROD.example.com.


  * The three subdomains have firewalls between them, and cross-domain
access is the exception, not the rule.
  * DEV is the only subdomain that is allowed to push code to a
central git repository.
  * TEST and PROD MUST  be pull
only. Repositories MUST NOT be modifiable from these subdomains.
  o Include the possibility that developers and testers may be the
same people, so user-based access control to a single git
repository won't work.

The solution that I came up with use two repository servers: 
git.DEV.example.com and git.PROD.example.com.


  * Projects in git.DEV.example.com include
  o Project directories owned by git:.
  o Group-based access control via "git init --shared=group
/path/to/project".
  o Push control set with "git remote add -t master -m master
--mirror=push gitPROD
ssh://g...@git.prod.example.com/path/to/project.git"
  o The "git push gitPROD" command in hooks/post-update.
  o git-web installed, but push access via SSH only. (WebDAV
probably wouldn't be approved by security.)
  * Matching projects in git.PROD.example.com would include
  o Project directories owned by git:git.
  o Access control via "git init --bare --shared=0644
/path/to/project.git".
  o git-web installed, and read access available via http.
Firewall modifications would be made to allow http GET access
from anywhere in TEST or PROD.

So, a developer has a git repository in their local workspace. When 
they're happy with their code, in whatever branch they're on, they 
push to git.DEV.example.com as their central repository in DEV. When 
that push happens, git.DEV.example.com automagically pushes the MASTER 
branch ONLY up to git.PROD.example.com. (If MASTER isn't changed, 
existing "no changes to push" results are fine.)


Here are my questions:

  * Am I missing a substantially easier solution?
  * For "--shared=group" is the group membership of the .git directory
the relevant group? I think so, but I would appreciate verification.
  * When the post-update script fires, who is the initiating user?
  o Is it the developer pushing to the repository?
  o Is it the user associated with the .git directory?
  o I need to know what user is launching the "git push gitPROD"
in order to allow/limit access on git.PROD.example.com.

Thanks!
David

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

[Chris Stone]

Are you able to clone a read only copy of the repo? Is you ssl cert added to 
the github repo? Have you tried using the git daemon instead of https? 

Sent from my iPhone

 On Jan 10, 2014, at 12:34, Kevin Ston kevinston1...@outlook.de wrote:
 
 Hello,
 
 I've got a self-signed ssl-certificate, which I'm already successfully using 
 in Firefox, wget and curl. I'm also connected to a proxy. I have a problem 
 with git: Everytime I try to do this:
 git clone https://github.com/puppetlabs/puppet-win32-ruby.git; 
 I get the error message:
 Fatal: unable to access https://github.com/puppetlabs/puppet-win32-ruby.git: 
 GnuTLS recv error(-): A TLS packet with unexpected length was received. 
 The hints in 
 http://askubuntu.com/questions/186847/error-gnutls-handshake-falied don't 
 solve the problem.
 
 I've no idea, what the problem is. Can anybody help, please?
 -- 
 You received this message because you are subscribed to the Google Groups 
 Git for human beings group.
 To unsubscribe from this group and stop receiving emails from it, send an 
 email to git-users+unsubscr...@googlegroups.com.
 For more options, visit https://groups.google.com/groups/opt_out.

-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.

Re: [git-users] SVN vs GIT

[Chris Stone]

Your reply may have been a joke or it may not have been. Either way I feel
your post added nothing of value to the thread and is therefore a waste of
bandwidth. The link you posted may be of value, however I was offended by
your comments. I use both git and svn and I am neither ugly or stupid.
On Mar 8, 2012 5:53 AM, Tassilo Horn tass...@member.fsf.org wrote:

 Serge Matveenko se...@matveenko.ru writes:

  By the way there is very useful video for getting people know benefits
  of git better.
  http://www.youtube.com/watch?v=4XpnKHJAok8 Tech Talk: Linus Torvalds
 on git

 That talk also highlights the most prominent disadvantage of SVN
 compared to git.  You are ugly and stupid if you don't use git.  You
 don't want to be ugly and stupid, and neither do you colleagues, right?

 There's also a tutorial depicting how to become pretty and smart:


 http://thetrilemma.wordpress.com/2011/11/23/git-for-ugly-and-stupid-people/

 Every other argument like cheap local branches and stuff like that is
 subordinate to not being ugly and stupid. ;-)

 Bye,
 Tassilo

 --
 You received this message because you are subscribed to the Google Groups
 Git for human beings group.
 To post to this group, send email to git-users@googlegroups.com.
 To unsubscribe from this group, send email to
 git-users+unsubscr...@googlegroups.com.
 For more options, visit this group at
 http://groups.google.com/group/git-users?hl=en.



-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

Re: [git-users] SVN vs GIT

[Chris Stone]

I wasn't trying to sound like I was taking the statement personally. Had it
been made clear that the text of the post was a joke instead of being taken
either way I would have a different outlook
On Mar 8, 2012 6:52 AM, tombert tomb...@live.at wrote:

 On Thursday, March 8, 2012 2:13:03 PM UTC+1, Chris Stone wrote:

 Your reply may have been a joke or it may not have been. Either way I
 feel your post added nothing of value to the thread and is therefore a
 waste of bandwidth. The link you posted may be of value, however I was
 offended by your comments. I use both git and svn and I am neither ugly or
 stupid.

 I don't think the statement ... You are ugly and stupid if you don't use
 git ... was meant personally - it was a generallization like the one you
 see on advertising spots: If you eat this *yoghurt *you will get pretty
 and healthy


  --
 You received this message because you are subscribed to the Google Groups
 Git for human beings group.
 To view this discussion on the web visit
 https://groups.google.com/d/msg/git-users/-/B_apgpQN860J.
 To post to this group, send email to git-users@googlegroups.com.
 To unsubscribe from this group, send email to
 git-users+unsubscr...@googlegroups.com.
 For more options, visit this group at
 http://groups.google.com/group/git-users?hl=en.


-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

Re: [git-users] getting changes since a specified commit

[Chris Stone]

Sounds like you want to create a patch file. Command would be git diff. I
have not worked with patch files much beyond applying them. Can any one
else fill in the details?
On Jan 27, 2012 11:53 AM, Kevin Wilson wkev...@gmail.com wrote:

 Hi,
 I have a git tree on one site, and a copy of it (from two weeks ago)
 on a second site. I cannot access the
 first site from the second one. The git tree on one site had some
 commits since I made a backup
 of it for the second site. I can of course backup the first tree and
 override the second one.

 I of course know which is the commit which is the latest when I made
 the backup (by git log).

 Is there a way that I can reproduce only the commits since that last
 commit in the first site and copy
 only them, and apply them, for the second site?

 rgs,
 Kevin

 --
 You received this message because you are subscribed to the Google Groups
 Git for human beings group.
 To post to this group, send email to git-users@googlegroups.com.
 To unsubscribe from this group, send email to
 git-users+unsubscr...@googlegroups.com.
 For more options, visit this group at
 http://groups.google.com/group/git-users?hl=en.



-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

Re: [git-users] Remote Repositrories

[Chris Stone]

If the network drive is mounted under projects you should be able to git
clone path to local repo folder name you want report cloned into if you
leave the second folder out it will default to report name. Also the --bare
Camden opt will not check out a working copy it will transfer the contents
of the .git folder to the network drive

Hope this helps with your issue
On Jan 1, 2012 12:32 PM, Newt new...@blueyonder.co.uk wrote:

 Hi,

 I'm a bit confused with using remote repositories.

 I've got a local repository set up. I'm now trying to clone it onto a
 network drive.

 So locally, I've done:
 cd ~/projects

 I've then tried:
 git clone --bare ./cal2 ssh://ip address/volume1/depot/cal2.git

 However, all this does is create a new folder in ./cal2 called ssh:
 and then creates directories beneath it. That's not what I want. What
 am I doing wrong...

 Cheers,

 N.

 --
 You received this message because you are subscribed to the Google Groups
 Git for human beings group.
 To post to this group, send email to git-users@googlegroups.com.
 To unsubscribe from this group, send email to
 git-users+unsubscr...@googlegroups.com.
 For more options, visit this group at
 http://groups.google.com/group/git-users?hl=en.



-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

Re: [git-users] Re: Remote Repositrories

[Chris Stone]

You would need to have the git installed on the NAS and the git daemon
configured for ssh. You would then have to setup the NAS repository as a
remote in your local git repository so you can git push your changes to the
backup

Assuming git is configured on the NAS I would do something like this

On NAS
git init --bare path to repository

On Local Machine

In project directory
git remote add origin path to remote repository -- this would be your
ssh path

then you can make a Backup by running
git push origin branch name

There are a number of articles on how to run a git server. This is
basically what you are wanting to set up with ssh access.

On Sun, Jan 1, 2012 at 3:11 PM, Newt new...@blueyonder.co.uk wrote:

 I don't need to check the repository out, just have a copy on my NAS
 for safe keeping.

 I can do it using a network drive, but that just feels a bit wrong.
 I'm sure SSH should work, but I can work out why.

 I may fall back to using the network drive if there is no other
 advice.

 Cheers.

 N.

 On Jan 1, 7:45 pm, Chris Stone nightshade1...@gmail.com wrote:
  If the network drive is mounted under projects you should be able to git
  clone path to local repo folder name you want report cloned into if
 you
  leave the second folder out it will default to report name. Also the
 --bare
  Camden opt will not check out a working copy it will transfer the
 contents
  of the .git folder to the network drive
 
  Hope this helps with your issue
  On Jan 1, 2012 12:32 PM, Newt new...@blueyonder.co.uk wrote:
 
 
 
 
 
 
 
   Hi,
 
   I'm a bit confused with using remote repositories.
 
   I've got a local repository set up. I'm now trying to clone it onto a
   network drive.
 
   So locally, I've done:
   cd ~/projects
 
   I've then tried:
   git clone --bare ./cal2 ssh://ip address/volume1/depot/cal2.git
 
   However, all this does is create a new folder in ./cal2 called ssh:
   and then creates directories beneath it. That's not what I want. What
   am I doing wrong...
 
   Cheers,
 
   N.
 

 --
 You received this message because you are subscribed to the Google Groups
 Git for human beings group.
 To post to this group, send email to git-users@googlegroups.com.
 To unsubscribe from this group, send email to
 git-users+unsubscr...@googlegroups.com.
 For more options, visit this group at
 http://groups.google.com/group/git-users?hl=en.



-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

Re: [git-users] Why does this happen (unexpected git behaviour)

[Chris Stone]

When you modify a file after it has been added to git inless you commit the
change on your current working branch when you switch branches the changes
will remain. At least that is what happened when I created a test file on
master, checked out a new branch, made a change to the file then switch
back to master. If you were to have done a git add file name then a git
commit on the test branch when you switched back to master the file would
have reverted back to what was commited on master. To pull the changes from
the test branch onto master you would need to perform a git merge.
On Nov 11, 2011 1:55 PM, JavaSrvcs jvsr...@gmail.com wrote:


 Unexpected git behaviour

 ---
 # First create a local git repo

 $mkdir gitexample
 $git config --global user.name my name
 $git config --global user.email m...@me.com
 $git init
 $git add .
 $git commit -m 'initial commit'

 # Create/Edit an empty file
 $vi readme.txt

 # add a single line: this was added in the master branch.
 $git commit -a

 # create and checkout a new branch (from master)
 $git branch test
 $git checkout test

 # edit the readme.txt file and do not commit
 # add the text:  this was added in the test branch., save and exit
 $vi readme.txt

 #now switch back to master
 $git checkout master
 $cat readme.txt

 #You will see both lines in the master.

 Question #1:
Why was this line added in the *master branch?


 --- even further surprising
 In the master branch, now do a commit
 $git commit -a

 cat readme.txt ( you will see the line in the master now that was
 added in the test branch )

 Question #2:
Why did this happen?

 # Now switch back to the test branch
 $git checkout test
 $cat readme.txt

 You will only see the one line: This was added in the master branch

 Question #3:
Why did this happen?

 and NOT the line added in that branch: this was added in the test
 branch = this line is gone

 What is the reason for this?

 1) Why do I see uncommitted changes in the branches made off master in
 the master branch?
 2) Why, if I commit them in the master, do the disappear in the branch
 in which they were made?

 This is confusing, I would think the * master branch would be left
 untouched.  This would solve issue #2.

 --
 You received this message because you are subscribed to the Google Groups
 Git for human beings group.
 To post to this group, send email to git-users@googlegroups.com.
 To unsubscribe from this group, send email to
 git-users+unsubscr...@googlegroups.com.
 For more options, visit this group at
 http://groups.google.com/group/git-users?hl=en.



-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

Re: [git-users] Git newbie not understanding branching and/or git flow

[Chris Stone]

You need to git checkout develop after you clone unless you specify the
branch during clone
On Oct 28, 2011 1:39 PM, John Green johngreen27...@gmail.com wrote:

 I'm transitioning from svn to git and I'm having a bit of a problem.
 I'm using git flow and I can't bring down changes I made.

 Here's what I've done. First,  I needed to get my svn sources down to
 my laptop and init a git repository with them. (I don't mind losing my
 svn history, really, I don't.) Step 1 was to create a git repository
 on my hosting company's server using their web UI. Then I did the
 following:

 $ mkdir workspace
 $ cd workspace/
 $ svn export https://myCompany.myGitHost.com/myCompany/MyProject/trunk
 MyProject
 $ cd MyProject/
 $ git init
 $ git add .
 $ git commit .
 $ git push g...@mycompany.mygithost.com:myCompany/MyProject-Git.git
 master

 This all seemed to work fine, giving me all the usual git stuff. Now I
 want to test this. Can I bring it down again (say I was another
 engineer) and can I use git flow properly?

 $ cd ../..
 $ mkdir test
 $ cd test
 $ git clone g...@mycompany.mygithost.com:myCompany/MyProject-Git.git

 It all looks good. I've brought my files down to my laptop.

 $ cd MyProject-Git/
 $ git flow init
 $ git flow feature start addFoo

 I make a mod, creating a file named foo in my source hierachy.

 $ git add .
 $ git commit
 $ git flow feature finish addFoo
 $ git push origin develop

 Ok, now lets see if we can bring this down from the remote server  .

 $ cd ../..
 $ mkdir test2
 $ cd test2
 $ git clone g...@mycompany.mygithost.com:myCompany/MyProject-Git.git
 $ cd MyProject-Git/
 $ git flow init

 I did the last git flow init just to make sure I was on the develop
 branch, since that was where the new file was created.

 My new file foo is not there. Where do I go wrong?

 I appreciate any advice, I feel so close to having it!

 --
 You received this message because you are subscribed to the Google Groups
 Git for human beings group.
 To post to this group, send email to git-users@googlegroups.com.
 To unsubscribe from this group, send email to
 git-users+unsubscr...@googlegroups.com.
 For more options, visit this group at
 http://groups.google.com/group/git-users?hl=en.



-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

Re: [git-users] does git clone automatically download branch information

[Chris Stone]

Yes this is normal behavior in regards to having to use branch -r to list
the remote branches. How ever you should be able to use checkout -b
remotename localname and git. Should auto setup tracking. If not there's a
configuration line that can be added to you. .git/config file. You can
reference the following man pages for complete details: git-checkout and
git-config
On Oct 25, 2011 11:01 PM, Sialnije sialn...@gmail.com wrote:

 Hi List,

 Just started learning git. I noticed that right after running git
 clone, the local depo only has history of the master branch. I have
 to run git branch -r and for each branch issue the git checkout --
 track -b branch ... command.
 Is this normal behavior? Is there a command line option to get git to
 fetch all the branch history?

 Thanks for help.
 si

 --
 You received this message because you are subscribed to the Google Groups
Git for human beings group.
 To post to this group, send email to git-users@googlegroups.com.
 To unsubscribe from this group, send email to
git-users+unsubscr...@googlegroups.com.
 For more options, visit this group at
http://groups.google.com/group/git-users?hl=en.


-- 
You received this message because you are subscribed to the Google Groups Git 
for human beings group.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.