Re: [git-users] .gitignore ignored?
On Fri, Oct 2, 2015 at 5:30 AM, Sascha Manns wrote: > Hello list, > > actually i'm having some trouble by using git. My .gitignore shows: > > sascha@sascha-desktop:~/RubymineProjects/hoe-manns$ cat .gitignore > Index.yml > hoe-manns.gemspec > .yardoc > SetupConfig > SetupReceipt > README.txt > doc > ChangeLog > pkg > .teamcity > .idea > Changelog > > But a git status says me: > > sascha@sascha-desktop:~/RubymineProjects/hoe-manns$ LANG=C git status > On branch develop > Your branch is up-to-date with 'origin/develop'. > Changes not staged for commit: > (use "git add ..." to update what will be committed) > (use "git checkout -- ..." to discard changes in working directory) > > modified: .idea/workspace.xml A file that is in the repo (already) needs to be removed first to be ignored. See: http://stackoverflow.com/questions/1139762/ignore-files-that-have-already-been-committed-to-a-git-repository I prefer this for the task (assuming changing history is ok) https://rtyley.github.io/bfg-repo-cleaner/ -- 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.
[git-users] shallow clone recommendations
I understand that of late shallow clones have improved in various ways I just tried to clone emacs Shallow emacs 262M Full clone 441M In particular shallow emacs' .git 38M Full emacs' .git 228M Most important it was some 2 hours with full and less than ½ hr with shallow However emacs devs prefer people to do a full clone I was wondering if there is/are have-the-cake-and-eat-it options. eg 1. Clone from a certain recentish tag to now 2. Change from a depth --1 to a depth --25 later 3. etc Note: Emacs is probably extreme in having a 40 year history(!) -- 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] Examining forks
On Sun, Aug 23, 2015 at 3:26 PM, Philip Oakley wrote: > I have a project on github which has been forked (friendly!). >> >> What is the best workflow to examine merge the commits in the fork? >> >> Of course I can git clone it separately but it seems that way I will miss >> out on all the git branch etc goodness >> > > Just set up the Fork as a remote, and Fetch it (not Pull which would merge > it). > > You will then see all of the forks data (assuming a full refspec for the > fetch) under the 'remote's' branches. > Yeah I gathered that remotes is what I want However I am a bit wooly around them. Particularly the syntax of the stuff that gets added to the remotes section of the repo-config remote+fetch (not pull) is new -- thanks > > It can take a sudden moment of realisation that remotes (rtb's) are > actually local, and are just a convenient naming convention to keep our(*) > little minds happy. > > Thats a good realization. Yeah I came to it also but its good that you confirm 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.
[git-users] Examining forks
I have a project on github which has been forked (friendly!). What is the best workflow to examine merge the commits in the fork? Of course I can git clone it separately but it seems that way I will miss out on all the git branch etc goodness -- 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.
[git-users] graft branches from one repo to another
I have two repos R1, R2. They should have been the same but due to some goofup they diverged. [R1 was on bitbucket; copied to github as R2; something not quite right with the copy I guess] Now R2 has moved ahead. But R1 has branches b1 b2 that did not get to R2. How to graft only branch b1, b2 from R1 to R2? -- 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
On Tue, Jun 2, 2015 at 11:07 PM, Konstantin Khomoutov < flatw...@users.sourceforge.net> wrote: > On Tue, 2 Jun 2015 22:09:46 +0530 > Rustom Mody 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 > Thanks Konstantin for the pointer. Can hardly claim to understand all the ins and outs of this... >From http://adaptivepatchwork.com/2012/03/01/mind-the-end-of-your-line/ I gather this is the "old system" And in the "new system" those "crlf"s should/would be "text" [This is also what I infer from the somewhat cryptic section "Backwards compatibility with crlf attribute" of the gitattributes man-page] Is that correct? IOW I can attribute all the file-types I want correct as per OS as text? Rusi -- http://www.the-magus.in http://blog.languager.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. For more options, visit https://groups.google.com/d/optout.
[git-users] Avoid EOL hell
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? -- 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.
[git-users] Mercurial
Not exactly a git question... If someone (who prefers git) has to work with a mercurial repo, are one of the git-mercurial bridges preferred or should one just stick to mercurial? If so which bridge is recommended? -- 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.
[git-users] Adding directories
Hi Context is we're using git for collectively editing documents(mostly text ie not Word etc). Sharing is on bitbucket. There are also largish reference-docs -- downloaded pdfs etc that are referenced but not ours -- dont want these in the repo. So... If I make a .gitignore that contains the 'downloads' directory, then the contents of downloads is of course ignored but also downloads itself. Making .gitignore contain downloads/* does not add downloads. Finally I added a dummy-file to downloads; add-commited it and then ignored downloads. Seems convoluted and unsure (to me). Is there a better way? Rusi -- http://blog.languager.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. For more options, visit https://groups.google.com/d/optout.
Re: [git-users] Setting up Git for Closed Source.
On Thu, Oct 9, 2014 at 5:10 PM, Gergely Polonkai wrote: > Hello, > > GitHub provides you private repositories. If that's OK with you to pay > them a small sum, that should work. Otherwise, if you need the full > functionality of GitHub, you may want to check GitLab, which does just > that. Or, if you only need a private, central Git repository, you can > install Git on a any server you want (and with which I'm not familiar with > in Windows environments). > Bitbucket is like private github -- only your selected users can see the repo -- you dont have to pay for under 5 users -- 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.
[git-users] Workflow for resurrecting an old program
I am interested in a rather old program -- first version was written more than 40 years ago -- in the Algol era! Its gone through various IBM/CDC machines until it ran on Irix in the 90s and briefly Windows until .Net 2003. After that its not exactly runnable. As may be evident the original programmer is elderly and while spunky, not exactly upto dealing with modern technology. He has shown interest in working with some of us who want his codebase modernized. So far thats not really relevant to git-usage. The issue that is a bit non-standard from git pov is that there is no clear starting tarball because some of the stuff is so old. So while we work on cleaning up and getting compiles through he is scrounging around for missing files (code and data). So should I handle this with git tools like branches, tags etc or just maybe keep a directory called original-stuff and put things there as they are found/provided? The other (minor) issue is whether to use bitbucket or github. I myself prefer bitbucket but would be interested to know others' findings on pros and cons. Rusi -- http://blog.languager.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. For more options, visit https://groups.google.com/d/optout.
Re: [git-users] Can I use git as auto-updater
On Thu, Mar 20, 2014 at 10:55 AM, Senjin Dragon wrote: > Let me sketch out what I'm trying to do. I'm not sure if I can use git for > this or not. I think I can but I'm getting headaches going through the > documentation and experimenting. It's all a bit confusing to me. > > I run a minecraft game server and associated client on my machine and a > friends machine who's computer-illiterate. I'm quite actively maintaining > this server by updating the various mods and configuration files that go > with it. These files also have to end up on the clients. On my own machine I > can simply copy it over, rename and delete the files. But it would be really > nice if I can do this on my friends pc as well. That he starts the game, it > checks for updates/changes, downloads and overwrites the existing files. > Doing the renames, deletes and updates for me. Theres an upcoming bunch of git-using tools with this (kind of) intent: mr, myrepos, etckeeper, vcsh. The mailing list where all these are discussed is here http://vcs-home.branchable.com/ Im an ignoramus who mostly lurks there (as here!) so dont ask me more! Rusi -- http://www.the-magus.in http://blog.languager.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. For more options, visit https://groups.google.com/d/optout.
Re: [git-users] Question about .gitignore
On Tue, Mar 11, 2014 at 2:50 AM, rhugga wrote: > > So .gitignore is used to hide certain file types which is great. But how do > you have it ignore the file itself? > > I put .gitignore in the file itself and that works but seems more like a > work around than as intended. The reasons and explanations others have given to not ignore gitignore should not be ignored :-) However if you insist, the manual does give options to do what you want >From http://git-scm.com/docs/gitignore SYNOPSIS $HOME/.config/git/ignore, $GIT_DIR/info/exclude, .gitignore The last option ie .gitignore, is the standard and recommended way. The other two will give you what you want ($GIT_DIR is normally just your .git directory) -- 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 do I remove a file from all branches in a git repository but leave it on the file system
On Mon, Aug 19, 2013 at 10:34 PM, wrote: > At some point I added a large file into a git repository. > It now exists on multiple branches, possibly with some > changes to it. I'd like to remove it from git, but leave its > current form (say the one on the master branch) on the > file system. Saw this the other day: http://rtyley.github.io/bfg-repo-cleaner/ seems to be somewhat what you want... [Noob to git myself :-) ] -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
[git-users] where/how did files disappear?
I am an org-mode (emacs-mode) user. org-mode uses git -- so those who want to stay upto date with the devel version use git pull, followed by a re-build. Recently the build system has been made more elaborate having a number of makefiles and pre-process makefiles: http://orgmode.org/worg/dev/org-build-system.html gives a summary of this infrastructure. Now recently my org-mode stopped working. I narrowed the problem to some disappeared makefiles. [git status output below] Running git reset --hard now gives me $ git status # On branch master nothing to commit (working directory clean) and now orgmode seems to be working. So now my questions: 1. How did/could those files have been deleted -- as I said I am not a developer and so have none of my own modifications? 2. Is reset --hard the correct way? Regards Rusi --- git status output $ git status # On branch master # Changes not staged for commit: # (use "git add/rm ..." to update what will be committed) # (use "git checkout -- ..." to discard changes in working directory) # #deleted:.dir-locals.el #deleted:.dir-settings.el #deleted:contrib/scripts/.gitignore #deleted:contrib/scripts/dir2org.zsh #deleted:contrib/scripts/ditaa.jar #deleted:contrib/scripts/docco.css #deleted:contrib/scripts/org-docco.org #deleted:contrib/scripts/staticmathjax/ .gitignore #deleted:contrib/scripts/staticmathjax/README.org #deleted:contrib/scripts/staticmathjax/chrome/chrome.manifest #deleted:contrib/scripts/staticmathjax/chrome/content/main.js #deleted:contrib/scripts/staticmathjax/chrome/content/main.xul #deleted:contrib/scripts/staticmathjax/defaults/preferences/prefs.js #deleted:contrib/scripts/x11idle.c #deleted:doc/.aspell.org.conf #deleted:doc/.nosearch #deleted:doc/Documentation_Standards.org #deleted:doc/Makefile #deleted:doc/dir #deleted:etc/Makefile #deleted:mk/fake_change_log.pl #deleted:mk/git-changelog #deleted:mk/guidesplit.pl #deleted:mk/list-hooks.pl #deleted:mk/manfull.pl #deleted:mk/mansplit.pl #deleted:request-assign-future.txt #deleted:testing/.gitignore #deleted:testing/examples/include.org #deleted:testing/examples/include2.org #deleted:testing/examples/link-in-heading.org #deleted:testing/examples/links.org #deleted:testing/examples/no-heading.org #deleted:testing/examples/normal.org #deleted:testing/examples/ob-awk-test.in #deleted:testing/examples/ob-awk-test.org #deleted:testing/examples/ob-lilypond-broken.ly #deleted:testing/examples/ob-lilypond-broken.org #deleted:testing/examples/ob-lilypond-test.error #deleted:testing/examples/ob-lilypond-test.ly #deleted:testing/examples/ob-lilypond-test.org #deleted:testing/examples/ob-maxima-test.org #deleted:testing/examples/ob-octave-test.org #deleted:testing/examples/ob-screen-test.org #deleted:testing/examples/org-exp.org #deleted:testing/examples/property-inheritance.org #deleted:testing/jump # no changes added to commit (use "git add" and/or "git commit -a") -- 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] Re: how to change message of old commit
On Mon, Jul 23, 2012 at 11:54 AM, Thomas Ferris Nicolaisen wrote: > > Could you point me to that 'git-bash thing'? -- Looks very useful >> > > Note that it only works for zsh (z-shell) and bash, so you'll need to run > either Linux, Mac, or Windows with Cygwin (or Git Bash). > > In the above shells, you have a variable called the PS1 which value > appears in front of your command line prompt (typically username@machine, > timestamp and stuff like that). There's a very popular script called > git-prompt.sh that adds useful Git context to the PS1. It's available here: > > https://github.com/git/git/blob/master/contrib/completion/git-prompt.sh > > Thanks. Neat! -- 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: how to change message of old commit
On Sun, Jul 22, 2012 at 2:18 AM, Thomas Ferris Nicolaisen wrote: > Well I can kinda see the parallel to vim when it comes to learning curve. > Git certainly has some areas where the ui can be improved, and the good > thing is that they are continuously making small steps to improve it (while > vim is pretty frozen by now). > Thanks for your kind words Thomas! > > There are a few "modes" I often use. Git doesn't really call them modes, > but I think of them like that as they are displayed in my console prompt > (I've got some git-bash thing that shows off stuff like this in my ps1). > > Could you point me to that 'git-bash thing'? -- Looks very useful > # Detached head: not on a branch. Typically checked out an old commit. > # am mode: in the middle of applying patches using git am > # rebase: as discussed. Can also occur during git pull --rebase > # conflict: when conflicts were found during merge > Yes this is the kind of thing I was asking about -- Say I do a pull and get stuck on a conflict. Is there some easy way to find out what state (or as you called it 'mode') git is in? Note that I may want to know this at a different point of time from when the pull message is still in front of me in the terminal. Konstantin sorry to have caused offense. No intention of being sarcastic. -- 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: how to change message of old commit
On Sat, Jul 21, 2012 at 2:25 AM, Thomas Ferris Nicolaisen wrote: > I suspect that you are in "rebase mode". That is, you're in the middle of > rewriting som history, and Git is waiting for you to type things like "git > rebase --abort" or "git rebase --continue". If you just want to get out of > this mode, I reckon also a "git reset --hard master" should get you back to > how you left things in master branch. > > It is said about vi: The text editor with two modes... one that beeps and one that corrupts your file Currently I have the same expertise at git that I had when first learning vi (many years ago) Can I find a summary of 'git modes' somewhere? -- 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
On Thu, Mar 8, 2012 at 7:32 AM, Andrew Gray wrote: > Hi All, > > At one client site we are using SVN. Client is a big corporate with > projects teams spread across 3 buildings on the same site. Project teams > are often sitting next to each other. > > I am trying to convince collegues that we should move to GIT. I have sent > them all the usual "GIT vs SVN" and "Why GIT is better than SVN" URLs. > > The pushback I am getting is: > 1. What does GIT give me that I don't get with SVN > 2. It is just another thing I have to learn and why should I when I don't > know what benefit I get. > > Can anyone assist with providing a compelling reason to move to GIT. > > Regards, > > Andrew > > > You may want to read this http://joelonsoftware.com/items/2010/03/17.html -- 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.
[git-users] conflicts and merges
As a git noob I am handling my first conflicts. I find the conflict-marker-ed files hard to decipher with the etc Is it possible to read the same information in emacs with ediff? I guess its related (or not dunno) how to grok 3 way merge? -- 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] managing only-local changes
On Sun, Nov 20, 2011 at 11:59 PM, radovan bast wrote: > is it a repo that you only use or a repo where you contribute to? > > > if you also contribute to the repo then i would change your Makefile: > separate it into a generic part and a specific part (Makefile.config, > included in Makefile). > it would then make sense to take Makefile.config outside of version > control. > Thanks. That brings up matter for another thread but for now I just want to say that you mean I guess?? Makefile.config : specific part Makefile: generic part [Just for anyone else who reads this thread] -- 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: managing only-local changes
On Mon, Nov 21, 2011 at 1:01 AM, Thomas Ferris Nicolaisen wrote: > The normal approach is pretty much what the error message says: Either > commit first, or stash the changes. Example of the latter approach: > > $ git pull > > $ git stash save > $ git pull > $ git stash pop > > > Beautiful -- Thanks! -- 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.
[git-users] managing only-local changes
When I am working with a certain git repo I need to make a 1 line change to the Makefile (for adapting to my paths) So then whenever I do git pull I get error: Your local changes to the following files would be overwritten by merge: Makefile Please, commit your changes or stash them before you can merge. What is the normal approach to solving this? -- 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] smartgit
Well thanks Konstantin for the answer! Ive tried a couple of times to post to the group and not succeeded earlier Did you see this now or earlier? I posted this 10 days ago. On Mon, Mar 28, 2011 at 2:32 PM, Konstantin Khomoutov wrote: > On Fri, 18 Mar 2011 14:02:11 +0530 > Rustom Mody wrote: > >> A noob question: >> As people may know smartsvn is quite popular among svn clients >> The folks making smartsvn have now made smartgit >> >> http://www.syntevo.com/smartgit/index.html >> >> Is this a good way to start using git? > > After cursory glancing through that product's web page, I doubt it. > This possibly could be a good idea if you're absolutely clueless about > how VCSes work, simply due to higher explorability of a > novice-oriented GUI interface compared to a bunch of command-line tools > which require prior knowledge from books and manual pages. > Git also comes with its stock GUI utilities (git-gui and gitk), but > they also assume a certain level of Git knowledge. > > On the other hand, be aware, that tools such like this one tend to have > two problems: > * They tend to be "smart" and do stuff behind your back deviating from > the normal behaviour of the underlying VCS. For instance, a tool might > "help" you by not exposing the concept of "index" or "staging area" > which is central to most of usual Git workflows, and instead the tool > could try to make you feel more like using Subversion. > It's hard to decide whether it's good or not. > * Most books and articles on Git (actually, all I've seen) discuss > conventional Git tools. Hence, if you will approach such a book > while sticking to some high-level GUI tool, you will probably find > yourself in the need of translating the book's vocabulary and examples > to those of your tool. > -- 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.
[git-users] smartgit
A noob question: As people may know smartsvn is quite popular among svn clients The folks making smartsvn have now made smartgit http://www.syntevo.com/smartgit/index.html Is this a good way to start using git? -- 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.
