Say I have uncommitted changes in my working directory. How can I make a patch from those without having to create a commit?
I’m trying to learn how to use Git effectively and I’m wondering how I should (good practice/bad practice?) solve the following case: Say I have the following chain of commits in master: Initial commit Commit 1 Commit 2 Commit 3 Then I realize that what’s done in the last two commits is completely wrong and […]
I want to push my commits to a Bitbucket repository but this error occurred: Fatal: unable to access ‘https://myUsername@bitbucket.org/myUsername/myRepository.git/’: Unknown SSL protocol error in connection to bitbucket.org:443
The Git integration in XCode 4 is very welcome however it seems to be a bit flaky when it comes to dealing with remote repositories. For clarity I’m using OS X version 10.6.7 and XCode 4.0.2 (4A2002a). If I create a new XCode 4 Project and accept the option to create a local Git repository, […]
I have a site as a remote Git repo pulling from Bitbucket.com using an SSH alias. I can manually start the ssh-agent on my server but I have to do this every time I login via SSH. I manually start the ssh-agent: eval ssh-agent $SHELL Then I add the agent: ssh-add ~/.ssh/bitbucket_id Then it shows […]
How do I delete a remote master branch from GitHub/Bitbucket? I’m trying: # git push bb –delete master remote: bb/acl: user is allowed. accepted payload.[K remote: error: refusing to delete the current branch: refs/heads/master[K To ssh://email@example.com/user/reponame.git ! [remote rejected] master (deletion of the current branch prohibited) error: failed to push some refs to ‘ssh://firstname.lastname@example.org/user/reponame.git’ Also […]
Which characters are illegal within a branch name?
I’d like to run git filter-branch on all children of a given commit. This doesn’t seem to be an easy task, since there doesn’t appear to be a way to tell git rev-list to only return children of a particular commit. Using the .. syntax won’t work because it will also include the parent commits […]
I don’t see a difference between the output of ‘git format-patch‘ and ‘git diff’, is there any? And won’t I be able to use ‘git diff’ to produce a patch and then apply it using git apply? My problem is that I have changes added to the index, but apparently git format-patch only accepts commits, […]
Our company subversion repo is a bit tricky: We’ve got a basic “default” layout with trunk, tags and branches. However, inside the branches, we have a “work” directory which contains more branches. Something like this: branches/release_1_0_x branches/release_1_1_x branches/work/dave/topic_one branches/work/tom/topic_two branches/work/something_else Now how can I get git-svn to recognize all those (and a few more) as […]