Git is an open-source DVCS (Distributed Version Control System).
0
votes
1answer
13 views
.gitignore not working after adding it to already modified repo.
I checked out a big repo and worked on it for a day which created lot of temp files. When I cloned the repo, I forgot to add .gitignore to it. So, now I see lot of temp files. I added my .gitignore to ...
1
vote
1answer
14 views
Git: Show every line added by user in current branch
I would like a certain 'non-technical' person to have a better idea of what I am actually doing when I work on a certain github project. I would like to create a text file with ALL the code I have ...
1
vote
1answer
11 views
Git: Adding the full tree of files to the master
I have an existing folder that has many files and folders with no source control.
I create a git repository in it's root folder:
git init
However, there is no "master"
git branch
returns ...
0
votes
1answer
18 views
Is it possible to have a GitHub repo with two branches that contain different directories on my local machine?
I have a jekyll site that I would like to have hosted on GitHub. Since jekyll plugins aren't supported on GitHub I was wanting to have my mater branch only contain the files inside _site and make a ...
0
votes
1answer
42 views
Coda 2 Mountain Lion git
I just upgraded to the new OS X Mountain Lion and git is not working anymore in Coda 2. It works ok in the Xcode and in the Source Tree (git GUI client I am using).
I updated git to the latest ...
0
votes
1answer
15 views
Tower is giving me a weird error message
I added a submodule in the wrong directory in Tower. So I removed it and am trying to add it in the correct subfolder. When I paste in the url of the submodule, Tower tells me "The destination path ...
0
votes
1answer
17 views
git log the difference between 1 branch from another
I have 2 branches A and B.
Whenever I run a build, Branch A gets merged into Branch B. I want to be able to email out all the updates made in A, since the last time the build was ran. How can I use ...
1
vote
1answer
26 views
git stash -> merge stashed change with current changes
I made some changes to my branch and realized I forgot I had stashed some other necessary changes to said branch. What I want is a way to merge my stashed changes with the current changes.
Is ...
2
votes
4answers
33 views
CVS alternative
as the title says, I'm looking for an alternative to CVS. Basically, I'm unable to setup an a constantly on CVS server, and so far, the current setup my team uses is a shared directory.
With that in ...
0
votes
0answers
16 views
Display commits since last merge, including commits merged in
I have two branches, staging and live. I have previously merged live into live. I want a list of all commits that have occurred since I last merged staging into live, and that list should have any ...
0
votes
1answer
10 views
git svn fetch with jgit
I use jGit to automate my interactions with git on my projects. There is an API corresponding to git fetch but I need here to execute git svn fetch and could not find anything about svn in the jGit ...
0
votes
0answers
16 views
Egit: configure rebase as default pull strategy for master branch
In our new project we've got 10 repositories, each of which have interdependent Eclipse projects.
I plan to establish a default workflow, where each developer is working on the master branch and uses ...
1
vote
0answers
24 views
Git diff tool on every commit?
I would like to run git difftool HEAD~3.. path/to/file and have git open the difftool for each of those three commits so that I can see a side-by-side view of each commit.
How would I go about ...
2
votes
1answer
27 views
Git: If I push a new branch to origin, how to make it tracking automatically
I created a new local branch and pushed it with
git push origin my-branch
How can I automatically set up my local branch to tag the just created remote branch?
Or do I always need
git branch ...
0
votes
1answer
14 views
Sync bare repo w freshly initialized non-bare repository
There is a remote bare repository B, and there is a project directory which is not under source control, but really is the same project, and was previously synchronized manually. I have put that ...