Hi all, I was trying to update version of Subversion used by git svn and so I ran the following command. > cpan SVN::Core It appeared to work; however, now git svn doesn't recognise HTTP URLs! > git svn rebase Bad URL passed to RA layer: Unrecognized URL scheme for 'http://<...>' at /opt/local/libexec/git-core/git-svn line 226...
Hi, I've been trying really hard to remove a file with sensitive data from my git repository using this excellent page (among others): http://help.github.com/removing-sensitive-data/ the primary line being: git filter-branch --index-filter 'git rm --cached \ --ignore-unmatch FileWithSecrets.java' HEAD However even when I follow...
this is probably naive question: i have file config.yml which is in .gitignore file when I'm switching branch to 'someotherbranch' and next i switch back to master then I don't see config.yml why ignored files are vanishing after switching branch and what can I do to avoid it? ...
I am doing some development by myself, and would like to have my code put into a RCS, and for ease I would like it to automatically commit all my changed code every night, with the option of tagging source at various times to mark good build. Any suggestions? I am using ubuntu. ...
Hello, I'm using git-svn to track multiple branches in the same svn repository. Usually this works fine, but today I've done some resets and rebases, and suddenly my branches wouldn't dcommit to the right remote branch anymore: $ git branch * master a b $ git svn dcommit -n Committing to svn://server/repo/trunk ... $ git checkout...
I setup TextMate (mate -w) for editing message for committing with git as follows. git config --global core.editor "mate -w" The problem is when I run 'git commit -v', instead of TextMate, COMMIT_EDITMSG is open with other editor (for my case, Aquamcs), and I can see the error message in command line. Aborting commit due to empty co...
I have never used any version control software before (yes, I know... ;-) and would like to change my evil ways using git. What book would you recommend for the total svn newbie? I will be using a MBP for django and iOS development and a VMWare XP guest for legacy win32 stuff. I'm looking not only for information on the usage of git, b...
I have recently cloned an hg repo to git so i can post it on github. Lots of the email addresses are wrong and I would like to use git rebase to change them before anyone forks this project. If i change them how do I go about pushing the new, completely rebased repo to github? can I just rebase and then git push? do i have to delete the...
I'd like to know more about the advantages and disadvantages of forking a github project vs. creating a branch of a github project. Forking makes my version of the project more isolated from the original one because I don't have to be on the collaborators list of the original project. Since we're developing a project in house, there is ...
I usually rebase when I pull in changes from my teammates, and often time I have conflicts: ... CONFLICT (content): Merge conflict in app/views/search/index.html.erb Auto-merging public/stylesheets/application.css CONFLICT (content): Merge conflict in public/stylesheets/application.css Failed to merge in the changes. Patch failed at 000...
I want to install from a particular branch on a git repo, how do I do it? ...
I tried to open my repository today and it came up with no commit history. Everything I tried (git status, git log, git checkout...) threw an error about a corrupt object. I researched this problem online and found the article by Linus Torvalds, but got lost at the point where he found the broken link ID: none of my file IDs, tree or bl...
Is there a way to change the file that is being pushed to the server using a server-side pre-receive hook? Say I want to add something to the end of a file like: //End of Org each time someone pushes to my repo. Is there a way you can change the file coming in using git hooks? ...
Is there a way to grep for something inside a Github project's code? I could pull the source and grep it locally, but I was wondering if it's possible through the web interface or a 3rd-party alternative. Ideas? ...
In our project we have to commit all changes to the clients svn repository. I want to move our team to git. So I'm thinking I'll need a central git repository that uses git-svn to push to the svn server. My questions: Is there a way I can get the central git repository to automatically push to the svn repository, or would a simple cr...
Hello, Can I see somewhere an example post-commit hook to run a script on each commited file? eg. git add file1 git add file2 git commit -am "my commit" and the hook executes: myscript -myparams "file1" myscript -myparams "file2" The best would be to have parameter to commit command to run this hook or not, eg. git commit -X… e...
Hi, i have followed this instructions below to upload a project. Global setup: Download and install Git git config --global user.name "Your Name" git config --global user.email [email protected] Add your public key Next steps: mkdir tirengarfio cd tirengarfio git init touch README git add README git commit -...
I'm considering using GIT or our family photos. The scenario is that both me and my girlfriend uses digital cameras, upload the photos to each our own computer. But still want to organize the photos into folders for different events, and have that organization replicated between our two computers. By having the GIT repository master on ...
Let's say someone has updated the remote origin with some nonsense and I want to ignore it. My repo looks like A-B-C-D And the remote is A-B-C-D-E-F I basically want to ditch E & F, but keep the history, so hopefully the result would look like /-----\ A-B-C-D-E-F-G I can't see how to reset or revert without replaying E & F...
I have a git repository, which has changes that I am slowly bringing into a mercurial repository. (It's a weird history, and I'm hand checking everything, and just as well that I am). Currently, I've generating a diff using git diff, and merging it using patch. That had a few problems, so I switched hg import, which has problems of its ...