Search Results

Search found 3789 results on 152 pages for 'git diff'.

facebook twitter digg google delicious technorati stumbleupon myspace wordpress linkedin gmail igoogle windows live tumblr viadeo yahoo buzz yahoo mail yahoo bookmarks favorites email print

Page 31/152 | < Previous Page | 27 28 29 30 31 32 33 34 35 36 37 38  | Next Page >

  • Protect Files from Git

    - by Tanner
    I'm using Git with WindRiver to manage a project of mine. The code is being managed, however the project files (such as .cproject, .project, .wrmakefile, and .wrproject) are not. However when I switch branches, Git deletes those files spite them being in .gitignore, thereby removing my ability to compile the code without having to revert commits or keeping a backup. So, is there a way to say to Git - ignore these files and don't touch them no matter what?

    Read the article

  • Git - Committing Machine Specific Configuration Files

    - by Gordon
    A common scenario when I develop is that the codebase will have several config files which require machine specific settings. These files will be checked into Git and other developers will always accidentally check them back in and break someone else's configuration. A simple solution to this would be to just not check them in to Git, or even to additionally add a .gitignore entry for them. However, I find that it is much more elegant to have some sensible defaults in the file which the developer can modify to suit his needs. Is there an elegant way to make Git play nicely with such files? I would like to be able to modify a machine-specific configuration file and then be able to run "git commit -a" without checking that file in.

    Read the article

  • Embed Git Commit Log in Rails App?

    - by Andrew
    So, I have a 'development blog' in a rails app I'm working on right now. I'm using Git for version control and deployment (although right now I'm the only person working on it). Now, when I make changes in Git I put a pretty decent log entry about what I've done. I'd love to have the Git commit log automatically posted to the development blog -- or otherwise available for others to read within the deployed site. Is there an automated way to pull the Git Commit Log into a view in a rails app?

    Read the article

  • Proper permission and directoy location for Git Version Control

    - by CitadelCSAlum
    I am using Git Version Control on an remote server and I have set up a repository that multiple people will be using to push/fetch from. I have put the repo under /srv/subdir/git/.git I have been experiencing problem after problem it seems like. a) Is this location suitable for handling a project that will need to be accessed/modified by multiple developers and a designer? Or is there a better location? b)Do I need to modify the permissions on the subdir/ and git/ directories in order to allow remote access? If I do what is the appropriate permissions I should allow? I know this is a faily long request/question, but unfortunately like many other topics with well covered documentation, documentation does not always cover best practices. I would appreciate anybodies advice and suggestions? Thanks

    Read the article

  • git can't remember my passphrase

    - by Subnus
    I have just start using git and i can't get it to remember my passphrase I'm using cmd.exe elevated and my git host is github and i have create a ssh key like that guide on github but i still get *\subnus.mvc>git push origin master Enter passphrase for key '/c/Users/Subnus/.ssh/id_rsa':

    Read the article

  • Managing .git file size

    - by DavidP6
    My .git file has grown to 229Mb and I wondering what the best way to cut down the size is. I know about git gc and have been using it a fair amount. I'm not totally sure about how git works, but I know that there is packaged information in there that I no longer need. Like, I know I no longer need the first five branches saved. Is there a way to completely erase really old branches or commits or something like that?

    Read the article

  • GIt Deployment + Configuration Files + Heroku

    - by Andrew
    I'm using Heroku to host a Rails app, which means using Git to deploy to Heroku. Because of the "pure Git workflow" on Heroku, anything that needs to go upstream to the server has to be configured identically on my local box. However I need to have certain configuration files be different depending on whether I'm in the local setup or deployed on Heroku. Again, because of the deployment method Heroku uses I can't use .gitignore and a template (as I have seen suggested many times, and have used in other projects). What I need is for git to somehow track changes on a file, but selectively tell git not to override certain files when pulling from a particular repo -- basically to make certain changes one-way only. Can this be done? I'd appreciate any suggestions!

    Read the article

  • git submodule svn external

    - by Jason
    Let's say I have 3 git repositories, each with a lib and tests folder in the root. All 3 repositories are part of what I want to be a single package, however it is important to me to keep the repositories separate. I am new to git coming from svn, so I have been reading up on submodules and how they differ from svn:externals. In SVN I could have a single lib/vendor/package directory, and inside package I could setup 3 externals pointing to each of my 3 repositories lib directory, renaming it appropriately like lib/vendor/package/a -> repo1/lib lib/vendor/package/b -> repo2/lib lib/vendor/package/c -> repo3/lib but from my understanding this is not possible with git. Am I missing something? Really I'm hoping this can be solved in one of two ways. Someone will point out how to create a 4th git repository which has the other 3 as submodules organized as I have mentioned above (where I can have an a, b, and c folder inside the root) Someone will point out how to set this up using svn:externals in combination with githubs svn support, referencing the lib directory within each git repository (from my understanding this is impossible)

    Read the article

  • git, SSH_ASKPASS on windows

    - by Martin Schreiber
    I am writing a graphical git frontend for Linux and Windows (MSEgit) based on MSEide+MSEgui. MSEgit has an internal console window which communicates with git by pipes. On Linux it uses a PTY so SSH asks for key unlocking passwords on the PTY. On Windows I wrote a small password entry application and set the SSH_ASKPASS environment variable accordingly. SSH calls the password application if git is started with CreateProcess() dwCreationFlags DETACHED_PROCESS set but the password entry window will not be focused, its taskbar icon flashes instead. SSH does not run the password application if FreeConsole() is called to be sure that there is no attached console to MSEgit and git is started without DETACHED_PROCESS but CREATE_NO_WINDOW instead. I assume a Windows equivalent of POSIX setsid() should be called. How can I force SSH to use SSH_ASKPASS without the DETACHED_PROCESS flag? If this is not possible, how can I ensure that the password entry window is focused?

    Read the article

  • Can git switch branch without the modification

    - by hguser
    I have a project which have completed the basic models(at master), then I commit them. Then I create two branchs user and product using: git checkout -b user git checkout -b product git checkout user Then I add the codes in the user branch, but I found that I have to make some changes for the basic models. Then I switch to master: git checkout master But I found that the modification I made in the user branch is visible in the working directory now. How to avoid this? Since the change to master and modification will be frequency.

    Read the article

  • git: Your branch is Ahead by X commits

    - by SeanJA
    How does this actually come about? I am working in one repo by myself at the moment, so this is my workflow: 1- change files 2- commit 4- repeat until satisfied 4- push to master Then when I do a git status it tells me that my branch is ahead by X commits (presumably the same number of commits that I have made). Is it because when you push the code it doesn't actually update your locally cached files (in the .git folders)? git pull seems to 'fix' this strange message, but I am still curious why it happens, maybe I am using git wrong?

    Read the article

  • Accept all merge conflicts in git

    - by Micah
    I'm trying to do a merge and there's a bunch of conflicts. It's all generated files so what I want to do is basically say "ignore all merge conflicts, and check everything in from my own repo". I've tried git checkout . --ours git add -A git com -a It gives me an error though because there are still files in the "unmerged paths" bucket. How do I handle this? Thanks!

    Read the article

  • git is very very slow

    - by dorelal
    My project is six months old and git is very very slow. We track around 30 files which are of size 5 MB to 50 MB. Those are binary files and we keep them in git. I believe those files are making git slow. Is there a way to kill all files of size 5MB from the repository. I know I would lose all of these files and that is okay with me. Ideally I would like a command that would list all the big files ( 5MB) . I can see the list and then I say okay go ahead and delete those files and make git faster.

    Read the article

  • Ignore deleted files in git?

    - by matthavener
    Is it possible to ignore deleted files in git? git update-index --assume-unchanged allows me to ignore modifications, but it still tracks deletions. (This is similar, but I couldn't find where "John Doe" restated his question: http://stackoverflow.com/questions/655243/ignore-modified-but-not-committed-files-in-git)

    Read the article

  • How do I find the original git user?

    - by Michael
    Hi all, I'm trying to figure out the current installation of git on a slicehost server. Following this guide, one of the early steps is to add a user, git. However, when I do a cat /etc/passwd, I don't see this user name... How do I find where my git user is? Thanks!

    Read the article

  • GIT sharing configuration data

    - by user569980
    Hi, I just started using GIT for my versioning and I want to program some tools that work on top of it. Here is my question: Which information in the .git/config is shared to a remote repo? Is any? Is there a special way to push information to that repo? The reason I am asking is that I would like to add a "unique stamp" to the config of a repo. Also the remote repo and everybody pulling that project should have the stamp. Is that possible? If not, is there any other way to identify a repository? Having a .git folder, I want to decide whether this git repo is the same as a previously specified remote repo (the same means created by pulling the remote repo, changes are okay, of course).

    Read the article

  • is there a 'git find'?

    - by Martin DeMello
    Is there a git find analogue of git grep, i.e., something that will find a filename by pattern in the tree? I've gone through a lot of git documentation and not found this, but I'm having a hard time believing it doesn't exist somewhere.

    Read the article

  • checking out a portion of a git repository

    - by ceejayoz
    How can I check out just a portion of a Git repository? I have a repository that has several modules, and I only want one of the modules installed on a particular site. In Subversion, I'd do svn export http://example.com/repository/path/to/module ./module-name.

    Read the article

facebook twitter digg google delicious technorati stumbleupon myspace wordpress linkedin gmail igoogle windows live tumblr viadeo yahoo buzz yahoo mail yahoo bookmarks favorites email print

< Previous Page | 27 28 29 30 31 32 33 34 35 36 37 38  | Next Page >