Merge request 1 (0000000000000000000000000000000000000000 -> 7991e49a9cd03f4413f533bb580063cd62b40a75)
By: anonymous
Against ref: refs/heads/master
Date: 2020-05-22 18:39
This merge request can be merged without conflicts.
Commit 7991e49a9cd03f4413f533bb580063cd62b40a75
- Vim config
Author: Tobias L
Author date (UTC): 2020-05-22 18:39
Committer name: Tobias L
Committer date (UTC): 2020-05-22 18:39
Parent(s):
Signing key:
Tree: 57b69be8777bd47abbb53a730fb68071c823b4cc
File vim/.vimrc added (mode: 100644) (index 0000000..30c46a3) |
|
1 |
|
call plug#begin('~/.vim/plugged') |
|
2 |
|
|
|
3 |
|
Plug 'tpope/vim-surround' |
|
4 |
|
|
|
5 |
|
call plug#end() |
|
6 |
|
set tabstop=4 |
|
7 |
|
set shiftwidth=4 |
|
8 |
|
set expandtab |
|
9 |
|
syntax enable |
Hints:
How to merge on your machine?
git fetch origin refs/mr/1:mr-1
git checkout main
git merge mr-1
To "see" all the merge requests as branches,
add, in the config file (.git/config), under the remote you want,
a line like this:
fetch = +refs/mr/*:refs/remotes/your_remote_name_for_example_origin/mr/*
After you run a git fetch, you will have all the pull requests locally.
For example, you can merge one of them:
git checkout main
git merge mr/1