Remove commits before specific commit
Hi, is there a way to remove all commits before a specified commit and use that commit as the initial? Regards, Erik ...
git
GIT usage for tracking a remote project, but keeping local changes private.
At work we contribute to an open source project using git, as well as keep local proprietary changes (we also license it). And what I'd like to do is setup a bare repository that is a clone of the upstreams repo. Our developers would then clone from this and push back to it using more of a cvs/svn development model - if Joe is working ...
What's the simplest way to git a list of conflicted files?
I just need a plain list of conflicted files. Is there anything simpler than: git ls-files -u | cut -f 2 | sort -u or git ls-files -u | awk '{print $4}' | sort | uniq ? I guess I could set up a handy alias for that, just was wondering how pros do it. I'd use it to write shell loops e.g. to auto-resolve conflict etc.. Maybe replac...
GIT core.editor setup on windows along w application PATH reference
Hey all so i wehnt ahead and opened up my .gitconfig file and manually input the [core] editor = 'C:/Program Files/Notepad++/notepad++.exe' which would allow me to execute command: (im trying to setup my .gitignore list) "C:/Program Files/Notepad++/notepad++.exe" .gitignore im JUSt not interested in typing this out every time t...
Git on windows :|
i've been experimenting with git as my personal code rep.. and it has been a bit of a disaster with windows. i've used Subversion, CVS, and Perforce in the past.. none were as annoying to use as git. i've figured out the PGP part (for github), although my workstation no longer lets me check in, and after searching around it turns out...
What is the 'standard' content of .gitignore for an iPhone (Xcode) project?
What is considered the 'standard' content of .gitignore file for an iPhone (Xcode) project? PS: not sure if this needs to be a CW. ...
Working with git from 2 laptops with no bare repo
I've started project in my first laptop. git init, and start working. Tomorrow i'm going to vacations. I want to take with me my smaller laptop. And work with project from time to time. I cloned repository via ssh from bigger laptop (git clone ssh://adress) And when i will back, what is the best way to push changes from smaller lapto...
Netbeans 6.9 and nbgit plugin
Does anyone here has working nbgit plugin with Netbeans 6.9? I've seen some patches for 6.9 in the repo, but the release 0.4 is not available for download yet on the project page. Is there any compiled version of nbgit 0.4 available to download somewhere? When I try to install nbgit 0.3, I keep getting the message: Some plugins req...
git crlf configuration in mixed environment
I'm running a mixed environment, and keep a central, bare repository where I pull and push most of my stuff. This centralized repository runs on Linux, and I check out to Windows XP/7, Mac and Linux. In all repositories I put the following line in my .git/config: [core] autocrlf = true I don't have the flag safecrlf=true anywhere...
How do you download a specific release of Android source code (e.g. Android 2.2)
I've never used git before, but I'd like to download the android source code as I'm getting a crash in the 2.2 emulator and I'd like to see exactly where in the android source code it's crashing (so I can file a better bug report). Edit A decent answer would include instructions on using git to download a specific repository. I'm on wi...
Deleting remote branches?
When I run git branch -a, it prints out like this, for ex: branch_a remotes/origin/branch_a Few questions: What does branch_a indicate? What does remotes/origin/branch_a indicate? How do I delete remotes/origin/branch_a? ...
Evil merges in git - where do they come from?
I've read this question and the answers, but what isn't clear to me is WHO creates the "changes that do not appear in any parent". Is it the git merge algorithm screwing up? Or is it because the user has to manually adjust the conflicts to get the thing to build, introducing new code which wasn't in either parent? ...
what's the Git equivalent of TFS commands shelve/unshelve? cherry-pick?
I found that the shelve/unshelve commands in TFS are very handy and very simple to use. What's the equivalent in Git ? here's the scenario in TFS : I made changes in the trunk I shelve : the change set is saved on the server (with a label) and I get the source back before the changes I work in the trunk Someone can unshelve : get the ...
Fixing warning from git
I've been doing a workflow of making a git repository on a remote central repository, cloning that repo on my local dev machine, doing some work, and then pushing the changes back to the same repo on the remote server. However, and I believe this was after an update I did to git recently, after pushing up a change, I'm getting the follo...
Unable to push to git Repository. It hangs after "Writing Objects: 100%"
I am running git daemon with the following command. c:\cygwin\bin\git daemon --reuseaddr --base-path=/cygdrive/S --export-all --verbose --enable=receive-pack I am able to clone and pull updates but when I try to push I get $ git push origin master Counting objects: 6, done. Delta compression using up to 2 threads. Compressing objec...
git workflow: throwaway merges and git-rerere - what's the point?
Like most people new to Git, I've had my share of confusion trying to decipher the use cases applicable to git merge and git rebase. I think I've finally decided that, as far as the resulting working copy state, they give you the same thing. Also, they both result in the same conflicts. If this is incorrect, please provide an example ...
Ruby-Git g.status always fails
I have been trying to use the ruby-git gem to make commits etc from with in a ruby script however the method to check the current status always throws an error. My understanding is that this code, although not doing too much, should be valid. #gem install git require 'rubygems' require 'git' g = Git.init g.status but it returns: ...
What's the best git installation structure for a one man shop?
I am trying to implement a version control system for my web apps/sites. I am currently working on 3 different machines (2 win and 1 osx) all of which have Dropbox installed. Inside dropbox I have all my webapp projects in a 'websites' folder. This effectively creates a backup of my source code and syncs all 3 computers. However my curre...
Git branches don't preserve loaded/unloaded project state in Visual Studio solutions
I'm surprised to find that the loaded/unloaded state of my Visual Studio (2008) projects is not maintained when I switch between git branches in which one should have all loaded and one should have some unloaded. I thought this was maintained in the .sln file, which would be versioned in each branch, but that seems not to be the case (....
github "origin" deletion
Hey all im trying to delete this "origin" thing so i can actually run the tutorial code from this website http://www.railstutorial.org/book#sec:github this is the code im trying to run $ git remote add origin [email protected]:delinquentme/first_app.git and im getting this returned: fatal: remote origin already exists problem is t...