git

"git pull" broken

I recently upgraded my MacBook Pro to Snow Leopard and "git pull" returns: rakudo $ git pull git: 'pull' is not a git-command. See 'git --help' Did you mean this? shell rakudo $ git-pull -bash: git-pull: command not found I've tried reinstalling via macports, but to no avail. Then I saw this rakudo $ git --exec-path /Users/...

How to merge remote master at two commits earlier than current local master

Steps Leading up to Question Here's what I did leading up to my question: Forked a project on Github and cloned it locally Made two commits to my local repo to fix a bug Pushed those two commits to my forked Github repo Sent a pull request via Github to the original repo owner Original owner made a different commit to resolve the bug ...

Looking for a suggestion for a git website repository/branch structure

I am looking for suggestions for how to structure projects using git repositories and branches. Assume I want a remote repository, and my project is a website that uses a Flash widget. The Flash widget is compiled from source code that I've written. To deploy my website, I would like the production server to just be another git client...

GIT and VMWare/Volumes

I have MacBook and Ubuntu Server on it as part of VMWare fusion virtual machine. When I use GIT on my local disk (Mac) everything is working perfectly but when I try to use git on volumes I have problems. For example /Volumes/vm1/webfolder is my local .git repository. If I create clone like $git@myserver:byrepo.git then I check for c...

How do I get Panic Coda to use Github for Source Control?

How do I get Panic Coda to use Github for Source Control? ...

Version control has me stumped

I've been developing websites for a few years now, and I've never had the time or energy to learn about version control. Now, as I start one of the bigger projects I've ever developed, I'm thinking of finally taking that plunge and using this as an opportunity to learn about version control. I've read a couple of brief descriptions and ...

Which version of eclipse works with egit?

For egit users, which version of eclipse are you using that actually works with the egit update url? The plugin (using the update url) did not work with my version of eclipse, and so I upgraded my version eclipse to the latest official version, and the git plug-in still doesn't work. (It says it is installed but the UI doesn't change t...

A few basic version control questions

... which I didn't feel like splitting into several question posts, since I guess, them being basic, most people here will know how to answer. I've been developing for several years now, and I've never had the time to learn about version control. Renaming directories with different version names always seemed enough. Now, I've finally...

.gitignore - ignore any 'bin' directory

Hi, I have a directory structure like this: .git/ .gitignore main/ ... tools/ ... ... Inside main and tools, and any other directory, at any level, there can be a 'bin' directory, which I want to ignore (and I want to ignore everything under it too). I've tried each of these patterns in .gitignore but none of them work: /**/bin/*...

Managing aesthetic code changes in git

I find that I make a lot of small changes to my source code, often things that have almost no functional effect. For example: Refining or correcting comments. Moving function definitions within a class for a more natural reading order. Spacing and lining up some declarations for readability. Collapsing something using multiple lines on...

Local PC Hosted or Remote SVN

Hi Guys, Currently I and two two friends are working on a small project. We are currently hosting the SVN ourselves. My question specifically relates to whether we should 1) Move to a private hosted solution - unfuddle or github 2) Continue hosting locally I guess our main concerns are 1) Security of connection 2) Privacy 3) Pr...

Git workflow for web development

I have been playing around with git on my local machine and everything makes sense until it comes to a remote and multiple developers I start getting confused. My goal is to have a "semi public" dev site/s that a group of 4 people can work on and push changes to the live site as they are ready. We need the dev site/s to be on the public...

Find tag information for a given commit

Is there a way to get the tag associated with a commit number in Git? For releases I usually tag with something like v1.1.0. During my build script I am creating a fwVersion.c file that contains the current git info. Currently, I have commit, and branch info in the file, but I would like to add the tag. Is this possible? Thanks ...

Gitosis not updating server configuration after push of configuration changes

Hi, I've set up gitosis using the tutorial privided at: http://scie.nti.st/2007/11/14/hosting-git-repositories-the-easy-and-secure-way I found that I was unable to push and create a new repository after adding the appropriate permissions in the gitosis.conf. I would continually get "read access Denied" error. I ended up checking the a...

Git replaced all of my LF with CRLF - How do I fix this?

I just ran a git add -A on my first git project. I got back about a thousand responses: "warning: LF will be replaced by CRLF" as it went through each file (Ruby files, some are gems). I deleted my .git directory and tried to disable this default setting by typing this command: git config core.autocrlf false Then I tried ...

Combining history of merged branches in GIT?

In my git repository, I have merged branch "B" into "master", getting the the following structure: --> A --> B --> C --> D (branch master) | | F --> G --> H (branch B) I now want to combine the branches to get the following history: --> A --> B --> F --> G --> H --> D How can I do this? Regards, Jochen ...

Switching branches in git

Sometimes I'm in a feature branch, but I've made an unrelated change that I want to see in master. Often I can just do: git checkout master git commit -m "..." filename But sometimes when I do the checkout I get a warning that there are local changes and thus I can't switch the branch. Why does this only happen sometimes? Is there ...

How can I print out the value of a git configuration setting (core.autocrlf) on Windows?

I'm trying to fix a problem with CRLF on Windows. How do I see what the value of the configuration setting core.autocrlf is set to on my system? ...

When you set a global configuration option for git on Windows, where does it get written to?

If you set something like this on Windows: git config --global core.autocrlf false Where is this global setting getting written to? ...

"git push" failed: "You did not specify any refspecs to push"

I set up a git project on projectlocker to push my git files to. Then I went into the directory where I had initialized a git project and staged my files. And finally I tried to push the project to projectlocker with this command: $ git push [email protected]:helloworld.git It generates this error: warning: You di...