Posts tagged git

Git delete local and remote branch

1
11 years ago
by Pieter Vogelaar in

First checkout a different branch than the one you want to delete, for example the master branch.

git checkout origin master

Solution 1

To delete your local and remote branch execute the following. “-r” stands for remote and “-d” for delete.

git branch -rd example

Solution 2

First delete the local branch:

git branch -d example

And after that also the remote branch:

git push origin :example

Git how to create remote branch from checked out master

0
13 years ago
by Pieter Vogelaar in

In a project you’ll reach at a certain point the need to start working on a new major version of your application, lets say version 2. Then you’ll probably want the current master to move to a branch with a name like “1.x” and from then on the master branch will contain version “2.x”.

To accomplish this, you’ll have to do some simple steps. I assume you already have a Git clone on your computer, go to the root directory of your clone and make sure you are in the master branch.

git branch -a

The branch with More >

Convert SVN to GIT bare repository

0
13 years ago
by Pieter Vogelaar in

When trying to convert a SVN repository that contained all our projects, I couldn’t find a good solution on the internet on one page.

The most usefull pages were:

https://github.com/nirvdrum/svn2git

http://qugstart.com/blog/git-and-svn/migrate-an-svn-repository-to-git-while-maintaining-branches-and-tags-structure/

http://book.git-scm.com/4_tracking_branches.html

I combined them together and described the steps below that will get the job done.

sudo adduser git
nano /etc/group
git:x:100:usera,userb,userc
sudo mkdir /usr/local/git_root
sudo chown git.git /usr/local/git_root
sudo chmod 2770 /usr/local/git_root

Create authors.txt file for user mapping:

root = Root <root@example.local>
usera = My name <myname@example.local>

To get a listing of all users in the repository:

svn log file:///development/svn_projects | grep -E

More >

Go to Top