Hi! I have a base repository with a "base site" that I clone to make my clients sites, so I work, make commits, push to the client fork, then I realize that in the middle of my commits there is one or more that must be merge to the base repository. That's what I did: git format-patch -1 SHA Then I go to the "base site" repository and ...
I have setup a git repository in a linux server, and installed the latest MSysGit and TortoiseGit on my Windows 7 laptop. I can pull from the remote repository by TortoiseGit, and I can commit & push to remote repository too. If I run "git log" in the remote server, it can show the latest comments correctly. But the new files are missing...
How would you accomplish this? mkdir newbuild cd newbuild git init git remote add origin git+ssh://user@host:22/var/www/vhosts/build $ git checkout -b origin/mybranch fatal: You are on a branch yet to be born ...
I've been using git-svn to work with svn repository A, and now I need to move the project over to repository B. I could just use svn to import the lastest HEAD from A. But I'd like to preserve the history if there's a way. Is there a way to do this? Can I add repos b as a remote branch and dcommit to it or something? Not sure. ...
I'm having problems with this situation: I have a base repository that contains a 'docs', 'layout', 'pub' and 'sql' folder, there is just a blank 'index.html' in the 'docs' and 'layout' folder. In the 'pub' folder I have Joomla installed. When I have a new client I make his directory and init a repository, then I add a remote named 'ba...
I am trying to install git-svn on mac os x 10.5 using the following command, sudo port install git-core +svn It installation is successful but i can find the git-svn command anywhere, ~/ $ sudo port installed git-* The following ports are currently installed: git-core @1.6.5.2_0+doc+svn (active) Installed shows it installed with ...
I'm looking to build and publish a latex document every time I advance the tip of a specific branch. I'm looking at what hook I should be putting my build script and which conditions I need to check for. ...
Is there an easy way to write C code that can access its Git version hash? I wrote software in C to collect scientific data in a laboratory setting. My code records the data it collects in a .yaml file for later analysis. My experiments change from day-to-day and I often have to modify the code. To keep track of revisions, I use a git...
github has this feature where you can publish "Project Pages" if you create a new branch gh-pages in your project. For full description see http://pages.github.com/ My project is just html/images, so I just want to serve the master branch. so how do I create a new branch called gh-pages that is just exact copy of master? some kind of l...
Okay so I made some changes in my project that resulted in a huge mess. I had already committed the changes so I could go back to it later, and then used git checkout HEAD^ to checkout the previous commit. Now as I'm making commits to my project it shows the SHA-1 on the command line as the working branch (instead of master) I don't kno...
I've seen tutorials that talk about creating a .gitusers file and converting your SVN authors to git users while doing a repo clone (via using the svn.authorsfile config option). However, our SVN repo takes 6-8 hours to clone and I don't want to do that again. Is there any way to retroactively update my git repo to use the correct git a...
I have a project with multiple branches. I've been pushing them to github, and now that someone else is working on them i need to do a pull from github. It works fine in master. But say I have branch xyz. How can I pull branch xyz from github and merge it into branch xyz on my localhost? I actually have my answer here: http://stackoverf...
I get this on every git svn command I try. I am using git version 1.6.4.2 on OS 10.6 The initial git svn fetch works, and i can do further fetches after that, but they do not enter the log or update the working copy. ...
I have an old branch, which I would like to delete. However, before doing so, I want to check that all commits made to this branch were at some point merged into some other branch. Thus, I'd like to see all commits made to my current branch which have not been applied to any other branch [or, if this is not possible without some scriptin...
Is it possible to clone a git repository which has more than one revisions? We tried to do it, and after the 1000'th commit it does a GC and exits leaving the clone in a unusable state. r998 = a5cb4f6a377b0ca80cd95d73b0e32f0552b9cdfd (git-svn) M trunk/asdf/asdf.java r999 = a87b06ae8aa497bb28c294b7ff8668ce2e4c8fcc (git-svn) D tags/sdafas...
! [rejected] master -> master (non-fast forward) error: failed to push some refs to '[email protected]:me/me.git' To prevent you from losing history, non-fast-forward updates were rejected Merge the remote changes before pushing again. See the 'non-fast forward' section of 'git push --help' for details. how can I merge remote chang...
Hello is there a tool for git that allow to work with mercurial repositories F.e. for svn there is a git-svn package, that allows to clone/commit/update from svn and work in a git way.. So is there some tool for mercurial for that ? ...
We still use CVS, I use git and hg for my personal use though I'm still a novice at both, but I realize they're much more modern and better, faster, distributed, etc. It's just everyone is so accustomed to CVS that I feel a whole slew of issues could arise if I were to be the one that recommended and actually did the upgrading/porting/t...
I tried to install TortoiseGit on Windows 7. Installation seemed successful, but TortoiseGit context menu does not show up after reboot. What should I do to install TortoiseGit context menu? P.S. 1. msysgit is installed and successfully configured in TortoiseGit, if it's relevant. 2. uac is not turned off. Thanks ...
In download section on github, you can download all version of the project associated with tags. But for some reason the tag descriptions are taken from the last commit. This happens even if one uses heavy tagging: git tag -a -m "tag commit message" Can I somehow force github to use my tag messages? ...