I'm trying to get just a folder from an external github repo to use in my project. I want my project setup to be like this: -my_project -submodule -code.py -MY_README -.git And I have the remote repo named some-submodule with this structure: -submodule -code.py -README -.gitignore So I just want the submodu...
I have the git repository where I am storing 4 different programs based on same code base. Some branches just have the different realization for some features. And others do completely different things(preparing the environment for calculation and calculation itself). There is no problem for me to make 4 different branches for it. But al...
Hello, Please give me a guide how to change an existing branch name in git. just simple.. I want to change current branch name to new branch name. Sorry for too easy question.. but I couldn't find the solution in googling. Thanks :) ...
I forked a project on github. I made commit 1,2,3,4 & 5 on my master branch. I want to present commit 2 & 5 as a pull request to upstream, in such a way that when upstream accepts, and I sync my branch with upstream, I don't get any conflicts. What are the various ways I could do that? ...
Hi! I need Git command to get/find last tag starting with 'v' to get last versioning commit (I am using tags with v letter at the beginning to tag next application version (example: v0.9.1beta). Is there any way to do it? ...
I've set my router at home to do port forwarding via SSH. I've succesfully cloned git repositories via: git clone git+ssh://user@localhost:1234/repos local_repos and then working locally, I can push and pull without trouble. Now I'm in the situation where I created a project locally and I want to put it on my home machine. This i...
I have two branches, A and B. Branch A have a directory examples with some files that are tracked by git, and these files should not appear on branch B. In my workflow, I do merge changes made in A into B often, which is a problem every time that there is some changes on examples. For the moment I am doing this manually: erasing the file...
For my school projects, I was used to have one big repo with several subdirectories for the specific projects. Because I had no time, I always commited anything into the master branch. The problem is, that this turns out to be unpracticable, as it becomes more and more difficult to revert older commits or figuring out which commit belon...
Hi there, Is there anyway to remove several consecutive commits in a branch ? Let's says the history looks like this : A -> B -> C -> D Now, I would like to remove changes introduced by B and C, so the history looks like : A -> D For instance, a typical scenario would be a drunk de...
Hello, CentOS 5.3 subversion 1.4.2 I have been using git for one of my projects. However, our company policy has changed and now I have to import my git project into our new subversion repository. I am just wondering how I can import a project created in git into a subversion repository? Ater I have imported the project I will have ...
This happens often in my work flow: I'm working on a feature in a separate branch, and while doing this I'll come across small things that need fixing but are from higher up in the framework or site layout for example. I want to switch back to the main develop branch and commit changes from select files there, then go back to a feature ...
Hi, all. THE SCENARIO I'm developing a Root FS for some embedded Linux device. It is sitting on the host, exported via NFS and my development board mounts is under "/". The workflows that I need are: - to share my FS to other developers(they have with their own dev. boards) - to backup my Root FS onto some "server" - to deploy my Root ...
Let's say you have a branch master and another branch production, both containing a version of the file prog.py, as well as many other files. Imagine that you modify many files in the production branch, including prog.py. Now, what is the best way of having only some changes made on prog.py in the production branch be applied to its ve...
I begin to use visual studio 10. After I'm done with C# program, I see that there are sln, and suo file in the project root directory, and csproj file in the subdirectory. What are those files for? I need to identify the files to put into git repository. Together with the source code/documents that I create, I guess those three files ...
Hi All, In a nutshell: what are best practcices for using Intellij Idea (9) and Git? Context We've recently upgraded to idea 9 and have started to use Git for a new feature on existing project. We largely use git command line to learn the tool better. But we thought we'd pick the hive-mind to find out what are best practices for gi...
our company provide internet access for us using proxy, but after configured http.proxy, i am keeping get HTTP code 417 After a little google, i guess it's because the libcurl that git use sent the "Expect: 100-continue" header, which the proxy(i guess a Squid) does not understand and reply with 417: Expection failed. I can not chan...
So lets say I have a directory structure like so uploads/ --dir1/ ----one.txt ----two.txt ----dir2/ ------one.txt ------two.txt I would like any directory and sub directories of uploads to be tracked but not any files in it with the exception of a dummy file because git doesn't track directories. I would think something like this w...
We have a "central" repo that we use to deploy to our development server. I know git log will show me commits and the date/time they were committed, but I'd like to see when commits were pushed to/received by the repo. Any way to do this? ...
Is svn-rebasing-and-pushing from multiple clients to the same Git repo vulnerable to race conditions if both clients try to svn-rebase and push concurrently? Here's more info: I'm setting up a GitHub-hosted mirror of an SVN project. To do the mirroring, I'll run this cron job every few minutes (per this article): git svn rebase git.e...
Hi guys! I'm kinda new to git and now I'm in this situation: i have like four branches (master, b1,b2,b3) after i worked on b1-b3, i realized i have something to change on branch master that should be in all other branches i changed what i needed in master and... here is my problem: how do i update all other branches with master br...