Tagged Questions
Git is an open-source DVCS (Distributed Version Control System).
learn more… | top users | synonyms | git jobs
0
votes
2answers
7 views
How to merge “develop” branch from different people in git flow branching model?
Is "develop" branch in git flow branching model shared by different people? So we have to manually push "develop" and pull it to merge?
Or each person have his "develop" branch and people need to get ...
0
votes
0answers
5 views
Gitblit “this repository has a working copy and cannot receive pushes” when create new repository
As title, when I create a new repository using WebUI tool from gitblit I got this problem.
I tried all type of solution:
Create a repository with anonymous read/write.
Create a repository with ...
0
votes
1answer
11 views
gem command not found through git bash
I'm new to git and I've been setting up a jekyll blog through my github account. I'm using the git bash command line. In the instructions one of the commands is:
$ gem install jekyll
When I run ...
0
votes
1answer
15 views
`git` and `less` integration in OS X terminal: prevent writing output of `less` to tty
In OS X terminal, when less is called on its own or by other programs like man, its output won't be written to the tty after we quit less. For instance, if we run less README, we would be temporarily ...
0
votes
2answers
13 views
Why am I getting this 'no such file to load' error with rake command?
I am working on lab 21 at this site. The directory path I have added the rakefile to is:
Now, it says I should be able to run the 'hello' program by invoking the 'rake' command from my console. ...
0
votes
1answer
20 views
Git default branch issue
I'm new to git and I'm working with another developer. I want whenever I do git pull or git push to only affect the development branch. I went to .git/config but I don't understand what is there. Any ...
0
votes
1answer
10 views
Forcing all local files to branch git
I would like to force all my local files to a branch, the branch was checked out from master but, i do not want to merge anything to the master branch i just want to force my code to the specific ...
0
votes
0answers
6 views
git eclipse pulls no project
Im new to working with repositories. I'm forced to work with my team on academic project using git. My job is to write Android app. The problem is when I wrote it, then pushed it to repo I want to ...
0
votes
0answers
7 views
What specifically does the AOSP repo tool checkout for each git repo?
Using the "repo" (written in python) tool from AOSP, when you use its "sync" command, according to other answers I've read here such as (How does the Android repo manifest repository work?) it will ...
0
votes
0answers
3 views
TortoiseGit fails on clone and push
TortoiseGit fals on cloning and push cloned repo.
I'm using ToroiseGit and msysgit. Using valid keys.
And console thing (git-cmd.bat) works correctly!
But TortoiseGit does't, what's wrong?
fatal: ...
-3
votes
0answers
13 views
how many projects use Google Maps or its competitors?
In my project I am supposed to know how many GIT and SourceForge projects use (not extend, or modify) GoogleDocs, OpenLayers, and pretty much any other geographical technologies.
I have the ...
0
votes
0answers
22 views
Git issue - I use a privately hosted git repo
I use a privately hosted git repo on a raspberry pi to store all my school work. I did this to help me familiarize myself with Git, and running a linux server in general. All was working fine, until ...
1
vote
1answer
13 views
How can I make gitweb ignore whitespace changes?
Is there a url parameter I can pass into gitweb (or anything else I can do) to tell it not to show me whitespace changes?
Backstory:
I have a file-generating process that creates hundreds of files ...
0
votes
1answer
17 views
Incorrect generation of bootstrap
My problem is that doing all through Hyde and generating a page with 3 Bootstrap eventually some reason I get the Bootstrap 2
Gemfile:
source 'https://rubygems.org'
gem 'rails', '4.0.0'
gem ...
0
votes
1answer
15 views
Added BitBucket repo as remote on GitHub
I've just installed git on Ubuntu, now I want to work on my repo in BitBucket. I'm a little confused on how to do so. I can't do the following:
git remote add BitBucketRepo ...
1
vote
1answer
37 views
Github shows wrong time of commits
This problem happens all the time and it drives me crazy. I will add, commit and push a file up to github and it will display the wrong time as to when it was committed. Sometimes it will show that ...
1
vote
2answers
25 views
Safe to delete a branch on Github if it's commits are in another branch?
Simply put, if you have a master branch, and let's say you split off a branch under that:
master/mybranch1
You make some commits in this branch, la la la. And then you decide you need to make a ...
0
votes
1answer
11 views
Can my git repository have information of alternative repositories?
How do I have my remote repository have information of multiple mirror repositories?
I created a local repository and added an origin and server1
# git remote add origin ...
2
votes
1answer
13 views
PHPUnit & Git: How to test with unreadable file?
Short version: For unit testing, I need an unreadable file to make sure the correct exception is thrown. Obviously, that unreadable file can't be stored by Git, so I chmod 000 at testing time and use ...
2
votes
0answers
26 views
How to set Visual Studio 2013 as default git difftool and mergetool?
I've followed some tutorials and posts but still seems to not work. Is it even possible to set VS2013 as default merge/diff tool for git on Windows?
Config
[mergetool "vs13"]
cmd = "C:\\Program ...
0
votes
1answer
39 views
git merging newer branch into older branch?
Wow, I'm having a heck of a time with git. Here is my situation.
Master -- all fine in good. Most recent code in production.
iss454 -- Originally pulled down remotely. Then I somehow merged ...
0
votes
1answer
10 views
Creating a git branch with a specific upstream branch that tracks an origin branch
I have a remote repository on github upstream that is cloned of another github repository origin. The origin repository has several branches: master, v1_x, v2_x. I'd like to fix a bug in v1_x, and ...
1
vote
4answers
30 views
Making Git retain Userscript header comment definitions between branches
I'm developing a Userscript that my employers have asked me to begin to manage via Git.
Right now, I have a stable file and a beta file, so that everyone in the organization can install the stable ...
0
votes
1answer
17 views
How to git clone 'git' metadata only
I have a remote repo called FOO which has the two following revisions :
commit1
commit2
I have a directory 'bar' which contains all the files for commit2 but I am missing the .git directory and all ...
0
votes
1answer
50 views
In a bash script, git does not recognize it own directory?
So I have written a bash script within Atlassian-Stash for post-receive events. In this script, after a commit has been made, it creates a codecollaborator code review. To create a code review, it ...
1
vote
1answer
24 views
Change git root folder
I have used the Github desktop application to manage my Github repository. I have the following folder structure:
myRepo/
config/
mappings/
src/
bin/
eclipse/
lib/
...
0
votes
0answers
27 views
What is the right way to commit/push when there are conflicts in git(tortoise git)
We are using git and the merge workflow. We have lot of git newbies (including me) who either has svn, cvs background or no version control background at all. However, here is a frequent issue we are ...
1
vote
0answers
12 views
History after subtree merged files
I wanted to merge a folder from one repository to another according to the subtree merge method (according to How do you merge two git repositories? and ...
0
votes
1answer
26 views
Git does not add all my files
I've created a project a while ago and switched computers in between. I cloned my project and am pushing/building from my new computer now.
Everything I change is added and pushed perfectly fine ...
0
votes
0answers
8 views
Git workflow from local to bitbucket/github hub to live webserver
I would like to setup a workflow that enables pushing local changes to Bitbucket or Github (but ideally the former) that then updates a live site hosted on my lamp VPS server. Is this possible? I ...
1
vote
0answers
6 views
Weird URL-behaviour with Maven Release-Plugin
I'm facing a pretty strange problem. I want to use the Maven Release-plugin to release a project. Additionally I'm using GIT on a Stash-Server. The relevant part of the pom looks like this:
25 ...
0
votes
3answers
14 views
Replace remote tag with Git
I have some tags on my "origin" repository. Then I realized I needed to add some changes on one of the tags, and push them back on my repository.
Is there a way I can push an existing tag to the ...
3
votes
2answers
36 views
merge git projects without common commit
right now i have several projects tracked with git. Now, i want to make one big project, with several subfolders for each of the previous projects and preserve their history along with the history of ...
2
votes
1answer
13 views
python sh git.diff('HEAD') blocks
The following script blocks:
from sh import git
git.diff('HEAD')
If I interrupt I get the following traceback:
^CTraceback (most recent call last):
File "main.py", line 2, in <module>
...
1
vote
2answers
25 views
Pushing git submodules correctly
I have the following repository layout:
Repo
|-- Folder1
| |-- file1
| |-- file2
| ...
|-- Folder2
| |-- file3
| |-- file4
| ...
|-- file5
|-- file6
...
Where 'Repo' is the main ...
-1
votes
1answer
13 views
how to sync the local code to amazon server through github webhook
I am following the tutorial to deploy my node.js app onto the amazon service with github 's webhook.
First, in my amazon server, I have created a repository named hook, and initialize it as a github ...
0
votes
2answers
31 views
Visual Studio, Git or something else [on hold]
So, me and my friend are doing this project in school and we really need to be able to work on the same project at the same time. I know Bitbucket is a great way to do this (since i've used it in ...
0
votes
0answers
13 views
Jenkins create build from git tags
I'm trying to configure Jenkins to create the builds form git's tags. So what I want is the developers to create a tag (in any branch) and Jenkins will take care of the new build.
I followed this ...
0
votes
0answers
13 views
Set up GIT on a NAS with Synology's official package
I bought 2-3 months ago a Synology 213air NAS for programing purpose.
Then before trying to set up git manually on my NAS, I heard that DSM4.3 will propose Synology's official package. So I decided ...
1
vote
2answers
40 views
Merge two similar Git repositories?
I have two repositories, one of which is a clone of the other.
Essentially what happened was there was a first repo created (A) which then has had work and a bunch of history generated, and then a ...
1
vote
0answers
17 views
How to checkout a tag with GitPython
In a python script, I try to checkout a tag after cloning a git repository.
I use GitPython 0.3.2.
#!/usr/bin/env python
import git
g = git.Git()
g.clone("user@host:repos")
g = git.Git(repos)
...
0
votes
0answers
14 views
Merge two git repos, different directories
I have the following situation:
Some months ago, a subdirectory - lets assume it's named "sub" - of a git repo (name "full") was moved to a standalone repo (name "mod"):
C1-D1 # mod (from ...
0
votes
0answers
14 views
Bamboo + Stash: Please tell me who you are
I'm trying to run a maven-job with Bamboo and release a project with the maven release-plugin. However, when Bamboo tries to commit something, the following error appears:
19-Nov-2013 13:20:37 ...
0
votes
1answer
20 views
Unsupported Git version
I forked repository https://github.com/hornetq/hornetq.git so that it comes under my user id https://github.com/aniket91/hornetq.git. Then i cloned this repository to my local machine. This is ...
0
votes
2answers
24 views
GIT wanna track of my files in my USER-account, everytime I wanna work with a single file
I've a txt-file in a /directoryfolder:
~/hej/git_testing(master ✗) git status inside I've: a file.txt
Now when I wanna know the status of this file : git status. I get this (see below)
It seems ...
2
votes
1answer
26 views
Setup 'git diff' for special file types
I want to manage Excel files in one of my repositories. Diffing them is a problem (they are binary files). However, there is a nice tool for diffing them: https://github.com/na-ka-na/ExcelCompare
I ...
3
votes
2answers
45 views
Can hard links get broken?
I have the feeling that from time to time my hard links get broken.
I use to synchronize a couple of copies by creating links via, e.g.:
link ~/work/genDocs/bibs/SKM.bib SKM.bib
Once a while I ...
0
votes
2answers
28 views
How to use git branches for different development stages of a web app?
I'm mostly new on Git, and I just recently learned the basics of git branching. One of my troubles now is how to set up git branching for use on my web project.
I use the main branch for production, ...
1
vote
1answer
13 views
How to push 'refs/replace' without pushing any other refs in git?
I have done a replacement of one commit with another in this way:
* HEAD
|
...
|
* ==> * `git replace left_commit right_commit`
| |
*-----/
|
...
This replacement is placed in ...
0
votes
1answer
13 views
Bower “Git not in the PATH” error
I just installed git and bower via NPM for a project. It's a first time use.
Then I tried running bower install jQuery for example, I get this specific error:
ENOGIT git is not installed or not in ...