Git is an open-source DVCS (Distributed Version Control System).
learn more… | top users | synonyms | git jobs
0
votes
0answers
6 views
git how to merge just the new changes in a single commit into another branch?
While working on a development branch (newstuff) I had a situations where I had to branch a temporary fix (quickfix) from a commit that was one behind my (master) and push it to a server.
That was ...
0
votes
3answers
11 views
pip: pulling updates from remote git repository
I installed scikit-learn from GitHub a couple of weeks ago:
pip install git+git://github.com/scikit-learn/scikit-learn@master
I went to GitHub and there have been several changes to the master ...
0
votes
1answer
25 views
Backing up small website to repository at github
I am working on developing a website and wanted to back it up on github. I took the following steps:
Created repository on the site (github)
In my local dev environment, I ran git init which ...
0
votes
1answer
21 views
Strange Github Issue - Permission Denied (publickey) even bitbucket has same issue
First I tried with explicitly specifying (have a look at following comman), it prompts for the passpharse. So, It is reading the right key file.
$ ssh -i ~/.ssh/id_rsa.pub -vT [email protected]
...
0
votes
2answers
22 views
Cannot pull remote repo (also permissions issues.)
I currently have a system that goes like this:
Local Host:
This houses the repo that I change and commit too.
Remote live host:
This houses the master branch
I have a github webhook which trigger ...
0
votes
2answers
13 views
Merging the latest copy of the master into another branch
I am new to Git and I just started working on a new branch. I want to make sure I have the latest copy of the master on my computer i.e the changes others made in the master, it has to be merged with ...
0
votes
2answers
36 views
Git short cut for adding, commiting and pushing to a remote repo
Is it possible to run the following commands all at once:
1. git add .
2. git commit -m "Message"
3. git push orgin/master
I know the the first two can sort of be joined like this:
git commit -am ...
0
votes
0answers
13 views
How to manage external libraries in Xcode/git source control?
Okay, I'm trying to add Endpoints for Google App Engine to my app project.
The directions for the iOS client code say to download this svn project:
svn checkout \
...
0
votes
0answers
9 views
Pentaho Kettle/ETL integration with Subversion or Git
We are using Pentaho ETL (aka Kettle). Pentaho has a built in enterprise repository for versioning. However, it is very poor. First, there's no way to go through an entire Pentaho project looking for ...
0
votes
0answers
15 views
Using a git submodule as an android library
I've seen a few similar questions to this but have not found a definitive answer and hoping someone could help. I have an android project with a subdirectory that is a git submodule that I want to use ...
android
4
votes
4answers
44 views
How to Make a git Repository 'pull only'
I am setting up a development environment on a shared server for multiple developers. I will have one repository that houses all code used in production, and many others used for development by ...
2
votes
3answers
23 views
Git: make a branch as master on Github while keeping real master on BitBucket
I have a project that is hosted on bitbucket as a private project. The project is now public by trimming many source codes and configurations from the root project. I have put the public project on ...
0
votes
1answer
36 views
Merging changes on a branch I forked from?
I'm a little confused with a Git branching idea.
I forked a branch (let's call it master, and let's call my fork CoolNewIdea), and made some changes on CoolNewIdea. Someone else did the same thing, ...
1
vote
3answers
45 views
Why does git merge with no conflicts still produce a merge commit?
I'm trying to understand why git will produce a commit with a unique SHA1 for a merge between two branches with no conflicts. Is storing the information that there were no conflicts really worth the ...
0
votes
0answers
8 views
GIT: rewriting history by untaring archives
I'm currently converting a CVS repository to multiple git repositories.
The cvs2git process is fine, but then I have problems running the filter-branch commands. I test the commands with simple ...
2
votes
1answer
34 views
How to prefer files from one branch during a merge?
Some time ago I created a branch from my master branch. Let's call it 'new_feature'. While I was working on 'new_feature' the master branch followed its normal evolution. Now that my 'new_feature' is ...
1
vote
1answer
19 views
Git list merged/unmerged tags
With 3 primary development branches:
patch
minor
major
When we create a patch release tag from the patch branch:
git tag -a my-project-1.2.3 -m "This is the 1.2.3 patch release of My Project"
We ...
0
votes
0answers
9 views
Unable to find stash/apply functionalitit in EGit
I'm working with Eclipse Kepler and EGit 3.0.0. Where can I find the GIT stash/apply functionality.
I cannot find it in the package explorer team pop-up nor anywhere int the snchronize perspective.
0
votes
2answers
13 views
github merging branch into fork before pulled into origin/master
So I have created a fork of Repo 1. My fork (Repo 1 Fork) has a branch (patch-1). I have filed a pull request to Repo 1. It is waiting to be merged.
Can I merge patch-1 into Repo 1 Fork?
Also, I ...
2
votes
2answers
29 views
Uninstalling GIT on windows
I have had various msysgit installs on my windows vista laptop over the past year, using the "msysGit-fullinstall", "msysGit-netinstall" and "preview installers. Also, installed / used different ...
1
vote
2answers
48 views
Git: what exactly causes remote branches to update?
According to Pro Git (3.5):
[remote branches are] local branches that you can’t move; they’re moved
automatically whenever you do any network communication.
However, this doesn't seem to be ...
0
votes
2answers
24 views
Git merge gives conflicts for almost all files changed from only one branch
I tried to merge my local branch with our development branch, but git merge gave me conflict for almost all files that were changed in local branch. So I had to resolve conflicts manually. Most of ...
0
votes
1answer
16 views
Pushing multiple repositories in a single command to bitbucket
I am an absolute newbee to bitbucket and git. I am working in a small company with 5 employees. We are storing multiple git repositories in a local server( in /home/user/git/project1, project2... ...
2
votes
1answer
23 views
GitHub “Failed connect to github” No Error
I'm pretty new to Git, but I've been using GitBash for commits, pushing and pulling for a week or two now. All was working fine, but a day or two ago when I started getting an error everytime I tried ...
0
votes
2answers
23 views
Reverting branch in git
I've been working in a branch, say master. Changes are already pushed to remote repository. My history looks like this:
*----*----*----* master
Then I realize that I may have done something wrong ...
1
vote
1answer
15 views
New SDK drop… how to instruct git that certain files are moved?
I've previously been working on an SDK that I've now received a new code drop for.
When starting on this project I created an import branch on which I committed the SDK and I merged that to my ...
0
votes
1answer
25 views
Git : Confuse after merge [duplicate]
I am new to git. Recently, I merged some code from feature to master branch. After merging my .gitignore file looks like this
<<<<<<< HEAD
gen/
bin/
=======
gen/
...
2
votes
0answers
28 views
How to move function declaration to another file yet retain Git history?
I am refactoring a single-file PHP script to declare functions and classes in separate files. How does one move a block of code from one file to another file yet preserve the Git history for each ...
1
vote
0answers
15 views
How to get src folder under project-root folder in github when staging from eclipse using egit
Current scenario :
In Eclipse when we create a project, say a PyDev project named ‘SimpleGit’, the folder structure created by eclipse will be like
EclipseWorkingDirectory/SimpleGit/src/
correct?
...
0
votes
1answer
13 views
GIT remote server backup onto aws server
Need you help in getting the correct approach to sync/backup all my remote repositories located at one server to another aws server. Basically I need to take a backup on regular basis and host it on ...
0
votes
1answer
21 views
Git on server with nginx
I was looking for manual how to set up git on server with nginx and I haven't found it.
I've logged in to server by ssh with root user, installed git-core and created a bare repo. Whats next? How to ...
0
votes
0answers
7 views
How to avoid Jenkins think the build is fixed when it builds another branch?
We use the git plugin to build all the branches of our repo (Branch specifier is **).
The problem is if branch A breaks, we get notified by email.
However, if someone pushed to branch B and it ...
1
vote
1answer
34 views
Libcurl.dll error with Git push
Recently I installed Git (Using Bit bucket for repository). I configured everything according to different guides I found on the net, but whenever I use the command git push -u origin --all I get the ...
1
vote
1answer
33 views
0
votes
1answer
15 views
git merge branch overwriting destination
I have this question: my repository have a master and dev branch, at this time I wish merge the dev with the master, or better, not a merge, but total replacement the content of the master branch with ...
0
votes
0answers
17 views
git svn dcommit fails because of assertion error “svn_fspath__is_canonical(child_fspath)” (cygwin)
I hope anybody can help me.
When I try to push my local git branch to the svn server this will always result into this error:
$ git svn dcommit
Committing to http://.../Dev_Stream/01_workspace ...
...
0
votes
1answer
38 views
Git best practices in everyday collaboration [on hold]
Are there any published guidelines from the community on using Git in a medium-sized (15 developers) team, often with members across the country?
I've been reading about Git and watched a very good ...
2
votes
1answer
14 views
Making changes to a git tag and repushing
Can I go into a tag in git and make changes and repush that tag and new changes?
I tried:
git tags
0.2.0
0.2.1
git checkout 0.2.0
Then I made some changes and did:
git add .
git ...
1
vote
1answer
26 views
working with hosted git repositories and sublime text
I haven't really used any version control until now, when a colleague sent me an invite for a project that is hosted on bitbucket. I'm not entirely sure what the workflow is supposed to be, but I do ...
0
votes
1answer
16 views
Merge specific commit from official repo into local repo
Suppose on 1st Jan, I forked (origin) and cloned(local) a github repo(upstream). I created a branch X on its master. And, started working on X. Over the time, I kept pushing the commits to origin.
I ...
1
vote
1answer
20 views
Git Svn clone certain revision, and continue cloning other revisions in the future
I am converting my svn repo to git. It is a very large repo and it keep failing, therefore I have to clone only part of it. I used the following command:
git svn clone -r100000:HEAD ...
2
votes
0answers
29 views
Imposible to checkout Git code for Windows 8 via TortoiseGit or msysGit. Works fine with Ubuntu Git. “Submodules error”
My Setup:
OS: Windows 8 x64
I use these VCS:
msysgit
http://code.google.com/p/msysgit/
and TurtoiseGit:
http://code.google.com/p/tortoisegit/
Server: Zend Server (LAMP) for Windows
So Git ...
0
votes
2answers
16 views
merge changes with GIT and SVN
Here is my problem. I am working with an external consultant, who created some code that he keeps in a GIT repo on github. Internally I have a development server that has SVN, and I can make a copy of ...
-1
votes
1answer
18 views
Git option not available under Version Control in Intellij
I have installed Git on my local machine. I am using Git as a DVCS
tool for bitbucket. I have the .git folder inside my project directory
as I had cloned the project. I want to integrate Git into ...
-1
votes
0answers
15 views
master rejected non-fast-forward in egit
I am using egit with eclipse. I am in in Team Synchronizing mode. I open the conflicted file. And having realized the local version is superior, I decide to click commit. But the commit is rejected. ...
2
votes
1answer
28 views
How to Diff between local uncommitted changes and origin
Lets say I cloned a repository and started modifying files. I know that if I have local uncommitted changes, I can do a diff as follows git diff test.txt and it will show me the difference between the ...
0
votes
0answers
25 views
Checking out a particular revision of a Git repo via CMake
CMake supports checking out git and mercurial repositories through the following components:
http://cmake.org/cmake/help/v2.8.11/cmake.html#module:FindGit
...
0
votes
2answers
42 views
Viewing long list of my commits to a branch
I have created a Master branch like this:
git branch -u MyMasterBranch origin/MyMasterBranch
and I have created other branches from that like this:
git checkout MyMasterBranch
git checkout -b ...
0
votes
2answers
29 views
Git revert screwup - recovery?
So I had two branches on github - master & refactor. I checked out refactor locally, and went to town. At some point, I screwed up and did a git push origin master instead of pushing to origin ...
2
votes
2answers
52 views
Git rebasing - can another person rebase remote branch for me?
The Scenario:
I'm working on a remote git repository with a team of say 20+. Branches are made, committed to and merged to master frequently.
One colleague and I worked together on a branch for a ...
Related Tags
github × 3885version-control × 2441
svn × 1474
branch × 1026
git-svn × 997
merge × 918
ssh × 675
git-branch × 615
ruby-on-rails × 589
repository × 579
heroku × 565windows × 557
eclipse × 555
mercurial × 517
git-submodules × 494
commit × 488
git-merge × 446
linux × 430
bash × 424
xcode × 421
gitignore × 415
osx × 385
egit × 371
rebase × 361
bitbucket × 359
