GIT - how to test a forked change / pull request?

I need to test the following pull request: https://github.com/grobian/carbon-c-relay/pull/274. I have cloned the master repo to my local drive: git clone https://github.com/grobian/carbon-c-relay.git carbon-c-relay. How do I incorporate the changes f...
more »

2017-06-20 21:06 (1) Answers

Gitlab can't open Directory

I have to subprojects in my gitlab repository, client and server, but I can't open the server directory, what does the symbol in the screenshot mean? I suppose it means it is a seperate git repository, but I checked the server directory and there was...
more »

2017-06-20 20:06 (1) Answers

git: re-setting DEV to latest version of LIVE

we run git and I have 2 branches: LIVE and DEV. There are 2 servers 1:LIVE and 2:DEV. They both are linked to respective remote branch. Sometimes we need to "completely reset" the DEV server to the latest version of LIVE. I understand I can merge; ...
more »

2017-06-20 15:06 (1) Answers

Merge changes from parent branch, in GIT

I have the following structure: ----parent_branch | ------ my_branch I have worked in my_branch so far, and important changes were made in parent_branch. I want to merge only those changes into my_branch, without messing-up what ...
more »

2017-06-20 09:06 (1) Answers

Pass data to gitolite-VREF via push

For my existing gitolite3-installation I want to add anonymous access, restricted to a certain number of repositories. Reading should be allowed for all these repositories, while write-operations should be protected. For that I thought of passing a ...
more »

2017-06-19 20:06 (2) Answers

Implement pwinty API using Java library

I'm trying to get to grips with using pwinty with a site i'm developing and seem to be in way over my head. The library file I (think I) need is: https://github.com/OddPrints/pwinty-java-sdk. I can't seem to find any proper clues on how to go about i...
more »

2017-06-19 18:06 (1) Answers

svn to git migration with long history is over 6Gb

I've been tasked with migrating our SVN to Git, while I've managed to do some projects there is one project that is giving me trouble. Having converted this project, the Git repo is over 6Gb. Note I have removed all binaries for SVN before the migra...
more »

2017-06-19 11:06 (1) Answers

Move code from Mercurial to Bitbucket

Currently, I have Mercurial as my version control in Kiln server. I want to migrate my code to Bitbucket server with Git. I have tried the import option available in Bitbucket but I can only import as a Mercurial repository. Is there any possible w...
more »

2017-06-19 10:06 (3) Answers

Git Submodule not reachable

I have a git repository that has a submodule. This git repository is mirrored in a separate environment as well. However, the submodule git repository is not mirrored. The two environments can't talk to each other. For the purpose of explaining the p...
more »

2017-06-18 11:06 (2) Answers

How to use brace expansion in gitrevisions <text>

Using GNU Bash 4.3 and Git 2.1.4, I encountered difficulty using brace expansion with gitrevisions syntax. Specifically, I want to get the Git commit IDs for some specific commit messages. Here is the log: $ git log --format=oneline 924d9120dec9f6...
more »

2017-06-17 22:06 (1) Answers

Get latest commit of list of files with Git

I'm trying to retrieve the most recent commit who modified/edited a list of files I provide. In practice, if I have a.txt and b.txt, where a.txt has been modified yesterday and b.txt has been modified 2 hours ago, I want to get the latest commit whi...
more »

2017-06-17 11:06 (2) Answers

Issue with remote GitHub repository

Now, here is the format of the folder on my Linux machine: /phd_simulations /ns-3 /pybindgen /scenario So ns-3, pybindgen, and scenario are all directories themselves... Is this the correct workflow for git? There is no Linux deskto...
more »

2017-06-17 08:06 (1) Answers

How to merge some commits from Git into SVN?

I have got a git repository, which contains two parts of source code from two svn repositories. The problem is, these three repositories are being maintained at the same time during this short period. Some new features were added to the git repositor...
more »

2017-06-17 05:06 (1) Answers

"git blame" a file access control modifier

I noticed that a couple .txt files in my git repository have execute permissions. I also noticed that when I did chmod a-x *.txt the repo actually showed changes. Here is the output of the git diff after updating the files. diff --git a/requirements...
more »

2017-06-16 23:06 (2) Answers

Are remote addresses pushed in Git?

When I'm working on a Git project, I clone the repo from Github, then add a remote: git remote add bitbucket https://foo@bitbucket.org/foo/bar.git then I commit and push to both origin and bitbucket. Is the new remote also saved in Github? Will the o...
more »

2017-06-16 08:06 (3) Answers

TFS and Git - Making users be limited to push code

We are using TFS as project management interface and we are using Git for managing the repository. We want users be limited to push a file and push to branch in the repository. For example: In branch A, user1 can not make changes to file1, user2 c...
more »

2017-06-16 06:06 (2) Answers

How can a new file be owerwritten at a git rebase?

So I had been working on a checkout out feature branch, let's call it feature-branch-development. I ended up with a considerable amount of commits on this branch, 15 or so. When it was finally time for me to rebase the master branch into feature-bran...
more »

2017-06-15 20:06 (1) Answers