I'm writing a git-install.sh script: http://gist.github.com/419201 To get Git's latest stable release version number, I do: LSR_NUM=$(curl -silent http://git-scm.com/ | sed -n '/id="ver"/ s/.*v\([0-9].*\)<.*/\1/p') 2 Questions: Refactor my code: Is there a better way programmatically to do this? This works now, but it's brittle: if...
I accidentally moved my Dynamic Data folder into my Images folder. The project still compiles, but it's just not right. However, when I try to move it back to the root in Visual Studio, I get an error that the destination folder already exists. If I move Dynamic Data back to the root outside of Visual Studio, the project no longer com...
D'oh! I just made a perfectly good commit to the wrong branch. How do I undo the last commit in my master branch and then take those same changes and get them into my upgrade branch? Thanks! ...
I'm trying to use tags for release management in git--I create a tag for each release. I'd like to be able to create release notes by listing the comment titles for every commit since a tag, or between 2 tags. I can't seem to find any way to do this. ...
Scenario: Local git repo, default master branch FTP server with content of the repo (non git), synchronized daily with the local repo, master branch Workflow: user1 is working on local git repo (git add, working directory clean) user2 (non git user) changed files directly on the FTP server How can I import all files changed on FT...
Hello. I would like to know how you normally deal with this situation: I have a set of utility functions. Say..5..10 files. And technically they are static library, cross-platform - SConscript/SConstruct plus Visual Studio project (not solution). Those utility functions are used in multiple small projects (15+, number increases over t...
Sometimes it happens that I make some changes in my working directory and I realize that these changes should be committed in a branch different to the current one. This usually happens when I want to try out new things or do some testing and I forget to create a new branch beforehand, but I don't want to commit dirty code to the master ...
git-rebase man page mentions -X<option> can be passed to git-merge. When/how exactly? I'd like to rebase by applying patches with recursive strategy and theirs option (apply whatever sticks, rather than skipping entire conflicting commits). I don't want merge, I want to make history linear. I've tried: git rebase -Xtheirs and git r...
I am trying to use git and MobileMe as a version control system for a personal project I am working across several computers. So far i have done the following. Created and empty bare repository on my local computer $ mkdir myproject.git $ cd myproject.git $ git init --bare $ git update-server-info I then copied the myproject.git dir...
Please can you explain about whitespace errors in git, what do they mean, what is 'squelching', and do I need to worry about it? (Running msysgit, but with other users on linux). There is already a 'definitive' answer for autocrlf here (set it to false git config --global core.autocrlf false ) ...
Hi, I have read this manual: http://www.kernel.org/pub/software/scm/git/docs/gitignore.html As I am working with gitosis, I rather use a .gitignore than explicit git commands. Thus says the manual: Of course, not tracking files with git is just a matter of not calling git add on them. But it quickly becomes annoying to hav...
Hello, I am getting the following error when I try to push my app to heroku. I saw a similar thread on here, but the issues seemed related to OSX. I am running windows 7 $ git push heroku master Counting objects: 1652, done. Delta compression using up to 4 threads. fatal: object 91f5d3ee9e2edcd42e961ed2eb254d5181cbc734 inconsistent o...
How can I get "git add -i" to start up in patch mode directly without having to type "5" + Enter? I know about "git add -p", but it's not the same as it doesn't show me a list of files to select from first. This is very annoying because I'd like to jump between "git add -i" and "git commit" very quickly to turn my dirty tree into some ...
Dunno what's going on, no response from github on this prob so I'm asking here. Tried a git push for the first time in a month or so and got this. Turned on export GIT_CURL_VERBOSE=1 and did a push and get this: localhost:send2mobile_rails phil$ git push Password: * Couldn't find host github.com in the .netrc file; using defaults * A...
I've been using SVN for all my projects. Sometimes project B is originating as a copy from project A. When project A has a generic change, I can use svn merge A within directory B and it will merge those changes. Now, if I wanted to use git. I don't like having all my projects in the same repository since I then have to clone everything...
Hey all, I'm a Git beginner with workflow questions. I've learned lots of commands, and I know how things work, but I can't seem to figure out the right workflow. Love to have some suggestions. [Note, I'm the only developer working on my projects] A friend once told me that it was best to work on the live server rather that on loc...
Hi, I would like to know if there is an easy way to push a GIT repository into production (on a FTP server) ? Thanks ...
I have a svn repo that has all my projects/main codebase. There are some dependencies on some external/third party code that will sometimes have a git repo along with it. My question is should I add the .git folders to my svn repo when I am commiting? I haven't figured out git-svn yet and I'm not sure what the workflow is, but just chec...
I want to do: git log -p [path/to/file] in GitHub because I want it to look pretty, and I want a link to send to someone else w/o the code. Thanks! Matt ...
Users can extend our PHP application with plugins, and we would like to host all these plugins, but more than just hosting files we want to allow users to version their files with git. Finally too, we'd like for other people using these plugins to be able to review/rate the plugins. Is there any such script/software out there that allow...