Gitlab配置

Installation

msysGit is a windows version of Git client. Download this installation package and install it:https://github.com/msysgit/msysgit/releases/download/Git-1.9.5-preview20141217/Git-1.9.5-preview20141217.exe

use default configuration is OK. Just click "Next" button all the way to the end.

Configuration
Set user name and email

Open Git Bash from desktop (or any folder) by right click:

061659368283860.jpg (216×402)

061659395003144.jpg (677×442)

config your user name and email: (They should be the same with your git profile settings)

git config --global user.name "Shishang, Yilin" 
git config --global user.email "shishangyilin@cienet.com.cn"
061713203127548.jpg (1018×503)

Add SSH keys

Open Git Gui from start menu:

04

Click Show SSH Key:

ScreenShot001

There is no SSH key currently. Click Generate Key:

ScreenShot002

Git will promt to request you set a passphrase for your SSH key, but it is not necessary. Just click OK to leave it empty:

ScreenShot003ScreenShot004

Select the whole SSH key text and click Copy To Clipboard:

ScreenShot008

Go to Gitlab Profile settings > SSH keys > Add SSH Key:

ScreenShot006

Paste your key here:

ScreenShot007

Click the "Title" input box, the title will be generated automatically:

ScreenShot009

Click Add Key and it is done:

ScreenShot010

Last Step: Test your SSH link to the git server to verify your key has been added correctly, open Git Bash and input:

ssh git@server_ip_address

Input yes and It's OK When you see Welcome to Gitlab, ...

ScreenShot011

Repository
Create New Repository
To be continued...
Clone Existing Repository

You can clone the existing project repository to your local machine, so you can work on it.

First you need to get the source location like below project "first":

Shishang  Yilin   first   GitLab

Create a new folder on your computer and open Git Bash:

screenshot 001

Clone the source repository:

screenshot 002

You can see the downloading information and wait until the clone is done:

screenshot 003

After the clone is done, open Git GUI and select Open Existing Repository:

screenshot 004

Browse to the repository folder that git clone created (It's in the folder which you created):

screenshot 005

Click Open And this is your project workspace, you can commit/checkout/merge changes here:

screenshot 006

Git Operation
Pull

Git Pull command is used to update your local repository with the latest version of source repository, it will also merge your local changes with the fetched source repository changes automatically.

First, create a quick access tool in Git GUI:

screenshot 018

The command is git pull:

screenshot 019

Then you can simply click the git pull tool to update the repository:

screenshot 020

You can see the details like how many changes updated in the message window:

screenshot 021


The command is git stash:


The command is git stash pop:


Push

Git Push is used to commit your changes to source repository. Before you start your change, it's better if you pull the changes from source repository first. After you finish your code change, open Git GUI and press F5 to refresh the unstaged changes:

screenshot 007

You can see the files list of your change on the left, and click on one file you can see the code diff on the right. Here you can examine your change and when it's ready, select the file you need to commit and click Stage To Commit or press Ctrl + T:

screenshot 008

Then the file will be moved from the red zone Unstaged Changes to the green zone Staged Changes (Will Commit).Note: Only the staged changes will be commited. In the Commit Message, input your comments on this commit. You can refer to the issue related to this commit with a #1 (the issue number) and the issue will be connected and closed by the commit. Click Commit when you are done:

screenshot 009

After commit, you need to push the changes to the source repository, click Push and confirm it:

screenshot 010

You can see the push details if it succeeded:

screenshot 011

In the above example, we refered the #1 issue so the issue has been connected to this commit and closed:

screenshot 016

Merge

When your change conflicts with the source repository, Git pull or push will fail:

screenshot

If you failed on pull and your changes has not been commited, commit them:

screenshot 013

If you has commited your changes and failed on push, click Remote > Fetch from > origin:

screenshot 029

Then click Merge > Local Merge or press Ctrl + M:

screenshot 014

Select the branch you want to merge into and click Merge:

screenshot 015

If there is no conflicts, the merge will complete automatically.

Then you can skip the following steps on conflict-resolving, just commit the merge changes and push to source repository according to the instructions after conflict-resolving.

If there are conflicts, the merge will fail:

screenshot 022

In Git GUI you can see the conflict file details. HEAD means your current branch status, origin/master is the source repository branch which you are merging into:

screenshot 023

Edit the conflict file, remove the auto-generated notes and merge the changes by editing:

screenshot 024

Commit the merge changes:

screenshot 025

Push to source repository:

screenshot 026

Success!

screenshot 027

In the project network view, you can see the merge on two parallel commits:

screenshot 028


Create Branh:




Create local branch and remote branch association:

git branch --set-upstream branch-name origin/branch-name

标签: Gitlab

本文转自:http://www.cnblogs.com/michaelins/p/4206355.html

评论
添加红包

请填写红包祝福语或标题

红包个数最小为10个

红包金额最低5元

当前余额3.43前往充值 >
需支付:10.00
成就一亿技术人!
领取后你会自动成为博主和红包主的粉丝 规则
hope_wisdom
发出的红包
实付
使用余额支付
点击重新获取
扫码支付
钱包余额 0

抵扣说明:

1.余额是钱包充值的虚拟货币,按照1:1的比例进行支付金额的抵扣。
2.余额无法直接购买下载,可以购买VIP、付费专栏及课程。

余额充值