Git push reminder/helper?

Sometimes I need (in order to make my development faster) harcode some stuff in my code. That can be credentials, or maybe just a hack to allow me to test certain feature. For many reasons, I never want to push this code to the main codebase or even ...
more »

2017-04-19 16:04 (2) Answers

Split svn2git in multiple revisions

I'm using svn2git to migrate a svn repo to a git repo. The svn repo is pretty big. The first thing I tried was: $ mkdir repo $ cd repo $ svn2git https://svn/repo/ --revision 1:40000 --username xxx This started well but after some houres I got: ...
more »

2017-04-19 14:04 (1) Answers

How to log every branch last commit time?

How to log every branch last commit time? Log the time relative today is excellent. I know git branch -v show sha1 and commit subject line for each head. I see the commit sha1, however, I don't remember each commit time. ...
more »

2017-04-19 13:04 (2) Answers

Advance master branch after 3-way merge

Suppose my commits look like this: Now, to perform a 3-way merge, I issue: git checkout iss53 git merge master Assuming there are no conflicts, my log now looks like this: How do I advance master to C6? The diagrams are adapted from those in Pr...
more »

2017-04-19 07:04 (2) Answers

git-annex use a file from a different location

My understanding is that when I perform git annex add somefile, it creates a symlink for that file and places it in the .git/annex/objects folder. Then, when I initialize git-annex in some different location and sync it with the previous one, it down...
more »

2017-04-18 23:04 (0) Answers

To make Jenkins job download code from GIT faster

I am working on Building .NET Application with Jenkins using MSBuild. As part of build process, first step we are downloading the code from GIT which is Appx. 2GB of data(sourcecode files along with dependencies/libraries). Jenkins job is taking 30m...
more »

2017-04-18 23:04 (1) Answers

git svn clone fails because of deleted branch

I am migrating some SVN repos to Bitbucket using git svn clone. It seems that the clone fails when the revision that it is going to clone doesn't exist because the branch it affected doesn't exist anymore in Subversion. I did git svn clone -authors...
more »

2017-04-18 14:04 (1) Answers

SmartGit Merge SVN

I use SmartGit for a SVN repository und try to resolve a conflict between master and a testbranch. While resolving the conflict in the conflict resolver tool from SmartGit works fine, I cannot push it to the SVN repository. svn: E160024: File or dir...
more »

2017-04-18 10:04 (1) Answers

How to filter history based on gitignore?

To be clear on this question, I am not asking about how to remove a single file from history, like this question: Completely remove file from all Git repository commit history. I am also not asking about untracking files from gitignore, like in this ...
more »

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

Showing Permission denied on ubuntu 16.04

I am using Ubuntu 16.04 installed on Virtual box. I have installed LAMP and git successfully. I tried to clone my git repository using terminal but it shows: fatal: could not create work tree dir 'directory-name': Permission denied I tried to give...
more »

2017-04-17 21:04 (1) Answers

vscode quick open "git checkout" shows no results

According to the docs, I can call "Quick Open" using "cmd + P", followed by "git checkout" to see the available branches to check out. I do not see this, as shown in the screenshot below. However, if I open the "Command Palette" by "cmd + shift + P...
more »

2017-04-17 00:04 (1) Answers

Cloud build failing on git submodules

I have a Unity project in a git repo hosted on VSTS with submodules, I've integrated it the git repo with Unity cloud build. When Cloud Build tires to do a build it seems to go fine checking everything out until it reaches the modules, it hangs on t...
more »

2017-04-16 15:04 (1) Answers

update local github account information

Unable to make commits to my new github account repositories from my local terminal. remote: Permission to <new-account-name>/22c.git denied to <old-account-name>. I have updated my global 'git config' settings` git config --list r...
more »

2017-04-16 01:04 (2) Answers

Get remote name from local branch

How to get the remote name from a local branch? Note that I do not want the remote tracking branch name but just the remote name. Consider this contrived example. How do I get prefix/github? $ git status -b ## dev...prefix/github/rm/dev $ git re...
more »

2017-04-15 23:04 (2) Answers

Recreate My Git Repo From this Commit Json file

So I messed up, bit time. I force pushed a new git repo over my existing one. I never should have done that. I was able to recover this json file that has the text of all of my files in it. How can I recreate my git repo or get all the files out in a...
more »

2017-04-15 03:04 (1) Answers