Re: [git-users] Just getting started

2023-07-15 Thread Chris Stone
t 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

Re: [git-users] Just getting started

2023-07-14 Thread 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

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

2023-07-10 Thread 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

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

2022-01-02 Thread Chris Stone
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 >> handl

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

2022-01-02 Thread Chris Stone
Hub > 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 wrot

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

2022-01-02 Thread Chris Stone
tHub 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

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

2022-01-02 Thread Chris Stone
efore 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 ca

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

2022-01-01 Thread 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. >

[git-users] Re: Rebase documentation is not clear enough.

2021-11-30 Thread Chris Webster
with the doc, please open a pull request to update it. ...chris. On Tuesday, November 30, 2021 at 9:56:26 AM UTC-8 philip...@iee.email wrote: > 'Documentation' is a tricky subject. Are the manuals for reference (i.e. > looking up the specifics that you already understand) or for edu

[git-users] How to configure smtp credentials helper

2021-09-02 Thread Chris Waldon
istopher.waldon@gmail.com" This is one permutation that I've tried. So far as I can tell, the helper is never invoked, so I assume that the URL is failing to match. I'm not sure how/why though. Does anyone have a working SMTP credential helper configuration they can share with me? Ch

[git-users] beginners hopeless commit situation? I invited some changes to a tracked file outside of git

2021-07-07 Thread 'Chris Ryan' via Git for human beings
Hello. New member with first post here. For about a 2 years I've been using a one-person git system (on Bitbucket). Nothing fancy. Mainly to maintain an audit trail of changes to about half a dozen text files, and to make sure I could always get the most current version when working at

[git-users] Re: git log "double dot" showing a false positive?

2017-08-10 Thread Chris Murphy
better the commit candidates are for > examination. > > Or/and, you could try bringing this question up on the main *Git mailing > list* [1], might be it`s something obvious for people much > more involved with Git internals :) > > [1] g...@vger.kernel.org > > Regards, >

[git-users] Re: git log "double dot" showing a false positive?

2017-08-08 Thread Chris Murphy
fe8f3727fe56dc..branchB > > Hopefully, these two can show a bit simpler graphs of how > 9ba8f06829b2d2170f23254ed3fe8f3727fe56dc eventually gets in both "branchA" > and "branchB". > > On Tuesday, August 8, 2017 at 10:12:21 PM UTC+2, Chris Murphy wrote: >>

[git-users] Re: git log "double dot" showing a false positive?

2017-08-08 Thread Chris Murphy
sday, August 8, 2017 at 3:54:16 PM UTC-4, Igor Djordjevic wrote: > > On Tuesday, August 8, 2017 at 2:38:09 PM UTC+2, Chris Murphy wrote: >> >> You're right, I didn't mean to leave the --tags=1 in. I double checked >> that the --tags and greps didn't remove any lines from the outpu

[git-users] Re: git log "double dot" showing a false positive?

2017-08-08 Thread Chris Murphy
On Tuesday, August 8, 2017 at 8:38:09 AM UTC-4, Chris Murphy wrote: > > You're right, I didn't mean to leave the --tags=1 in. I double checked > that the --tags and greps didn't remove any lines from the output. > > However, I did overlook the carat syntax - on zsh, those need to b

[git-users] Re: git log "double dot" showing a false positive?

2017-08-08 Thread Chris Murphy
c7770ea9a062d189dc2e3238bdd6f5987d86e1cb refs/heads/branchA ± % git show-ref branchB 944405f8308c77200f7f4cb860a3f95a7a8ba6dd refs/heads/branchB Thanks for your patience, I appreciate the help! On Tuesday, August 8, 2017 at 2:45:07 AM UTC-4, Igor Djordjevic wrote: > > Hi Chris, > > On Tuesday, August 8, 2017 a

[git-users] Re: git log "double dot" showing a false positive?

2017-08-07 Thread Chris Murphy
format=%h\%d --graph --sparse --full-history branchA branchB ^9ba8f06829b2d2170f23254ed3fe8f3727fe56dc^ | grep -o ".*[0-9a-f]\{10\}\|.* $" https://gist.github.com/cmurphycode/0498a5530e68382d32f1833dfd669311 Thanks very much! On Monday, August 7, 2017 at 7:51:28 PM UTC-4, Igor

[git-users] Re: git log "double dot" showing a false positive?

2017-08-07 Thread Chris Murphy
especially in combination with the second gist I posted a minute ago: git log branchA...branchB --graph | grep "commit \|Date: \|Merge: " https://gist.github.com/cmurphycode/c1e581c04a89b7f5a679ad6e1ae1d7d6 Thanks, Chris On Monday, August 7, 2017 at 3:48:26 PM UTC-4, Chris Murphy wrote: &g

[git-users] Re: git log "double dot" showing a false positive?

2017-08-07 Thread Chris Murphy
TC-4, Igor Djordjevic wrote: > > Hi Chris, > > On Monday, August 7, 2017 at 5:28:15 PM UTC+2, Chris Murphy wrote: >> >> The history of the repo is quite tangled with many merges, but I uploaded >> it here (with sensitive info removed, sorry, it's a repo for

Re: [git-users] git log "double dot" showing a false positive?

2017-08-07 Thread Chris Murphy
Unfortunately not -- that's also why I included the --contains result. ± % git log --pretty="%H" branchA | grep 9ba8f06829b2d2170f23254ed3fe8f3727fe56dc 9ba8f06829b2d2170f23254ed3fe8f3727fe56dc ± % git log --pretty="%H" branchB | grep 9ba8f06829b2d2170f23254ed3fe8f3727fe56dc

Re: [git-users] git log "double dot" showing a false positive?

2017-08-07 Thread Chris Murphy
: > > On Mon, Aug 07, 2017 at 08:28:15AM -0700, Chris Murphy wrote: > > [...] > > ą % git --version > > git version 2.13.0 > > > > % git log branchA..branchB | grep > 9ba8f06829b2d2170f23254ed3fe8f3727fe56dc > > commit 9ba8f06829b2d2170f23254ed

[git-users] git log "double dot" showing a false positive?

2017-08-07 Thread Chris Murphy
Hi, My understanding is that the command git log branchA..branchB should return the commits reachable via branchB that are not reachable via branchA I use this command a lot and have never noticed an issue, until

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

2016-01-06 Thread 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

Re: [git-users] Strict, domain-based read/write vs. read-only access.

2016-01-06 Thread 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-users] Need some advice on git setup -- development files must be run on the server

2015-05-25 Thread Chris Fillmore
Hello, I've just started a position where we are not yet using version control at all. The team was previously just a single developer, and now there are three of us. I've used git before on teams, but not in an environment exactly like this, and I need some advice. The code we are working on

[git-users] Can't clean untracked changes.

2014-09-29 Thread Chris Carter
Windows 8.1 64-bit git version 1.9.4.msysgit.0 I think I found a bug, but want to make sure before I actually say so. Background: I've been trying to compile Qt, and after doing so decided I wanted to do it differently. The steps for this process involve fetching the various Qt modules with

Re: [git-users] git - ssl problem

2014-01-13 Thread 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,

[git-users] Using Git as a user documentation source file repository

2013-09-04 Thread Chris Bridgen
Hi My organization is thinking about Git as a repository for FM+SMGL source (binary) files. We have very minimal requirements: * ability to check in / check out multiple files at the same time * ability to download entire sets of files to another server * ability to restrict some user's

[git-users] git5 patch error

2013-06-25 Thread Chris Sweeney
When I run git5 patch -c cl to patch I get the error below. I have tried from a fresh client, ensured I am tracking the proper folders, etc. with no luck. A colleague was able to run this command on the same CL successfully without issues. Has anybody come across this issue or have tips for how

[git-users] glassware

2013-06-14 Thread Chris Vukin
are there any developers interested in working with glassware? -- 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

[git-users] why can't I add vim-latex as a submodule?

2012-11-01 Thread Chris Lott
I am trying to install the vim-latex plugin as a git submodule. The github is: https://github.com/jcf/vim-latex I am using the given repository info: https://github.com/jcf/vim-latex.git the command I am using is: git submodule add https://github.com/jcf/vim-latex.git bundle/vim-latex But when

Re: [git-users] Using git-svn to follow a branch: detached

2012-09-27 Thread Chris Stankevitz
the answers to these using the test repos I attached in my original post. Thanks again, Chris -- 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

[git-users] Using git-svn to follow a branch: detached

2012-09-25 Thread Chris Stankevitz
-newbranch 4. Assuming (3) is possible, will I be able to dcommit local-newbranch? Thank you, Chris -- 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

Re: [git-users] Forcing a push from one branch to another

2012-09-25 Thread Chris Stankevitz
want? Thank you again, Chris -- 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/-/5T9mRBmV7nQJ. To post to this group, send email to git-users

[git-users] many ways to include other projects like submodule, subtree etc.

2012-08-10 Thread chris
I read a part of book Pro Git, I have read section of submodule and subtree. I know that they are difficult to manage. First explain my situation: I *forked* oh-my-zsh repository (a repo of zsh configs). Then I add original oh-my-zsh repo as a *upstream remote*. Then I found some interesting zsh

Re: [git-users] Applying licence (eg. GPL) to Git history

2012-06-14 Thread Chris Jewell
Hi Tassilo, Thanks *very* much for the information! That's really very useful to me. Cheers, Chris On 14 Jun 2012, at 12:45, Tassilo Horn wrote: Tassilo Horn tass...@member.fsf.org writes: Check out http://www.gnu.org/licenses/gpl-howto.html That says that you should add at least

Re: [git-users] SVN vs GIT

2012-03-08 Thread 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

Re: [git-users] SVN vs GIT

2012-03-08 Thread Chris Stone
, 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

[git-users] Re: git-svn: mapping individual subversion branches

2012-01-30 Thread chris
/some_branch:refs/remotes/git-svn/some_branch which worked like a charm for individual branches. I haven't grafted the history though. Hope that helps, Chris -- 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

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

2012-01-27 Thread 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

[git-users] git-svn: mapping individual subversion branches

2012-01-25 Thread chris
/* And then later rename branch extra/some_branch to some_branch and delete all extra/* branches. This seems a bit clumsy. Any better way to do this? Like directly mapping a single branch? Chris -- You received this message because you are subscribed to the Google Groups Git for human beings group. To post

Re: [git-users] Remote Repositrories

2012-01-01 Thread 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

Re: [git-users] Re: Remote Repositrories

2012-01-01 Thread Chris Stone
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

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

2011-11-11 Thread 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

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

2011-10-28 Thread 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

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

2011-10-25 Thread 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

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

2010-01-11 Thread Chris Johnsen
would not treat \#foo the same (Git would match #foo, rsync would match \#foo). -- Chris -- 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-us...@googlegroups.com. To unsubscribe from this group, send

[git-users] Re: question regarding multiple ssh keys

2009-12-01 Thread chris
: Interestingly enough -- your output is encouraging. Hmm ok, it looks like you are on a Mac and you are likely on Snow Leopard, based on the version of openssh you are running. (It matches mine). I'll annotate your message below: On 2009/12/01, at 10:09 , chris wrote: Here is the output from