artwork/git-mini-howto-for-gitorious.txt at master · anditosan/artwork · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
Substract of the http://en.opensuse.org/openSUSE:Marketing_and_Artwork_repository wiki page

git mini-howto

cd the-place-you-want-the-repo
git clone git@gitorious.org:opensuse-artwork/opensuse-artwork.git
git remote add origin git@gitorious.org:opensuse-artwork/opensuse-artwork.git
cd opensuse-artwork/
git remote add origin git@gitorious.org:opensuse-artwork/opensuse-artwork.git
git checkout -b master
git remote add origin git@gitorious.org:opensuse-artwork/opensuse-artwork.git

# now edit something, add files etc ...
# vi posters/README

git add *
# or you can use more selective ways git add mynewfolder/mysuper-art-contrib.svg

git commit -m "This is a usefull comment which describe what I updated"
git push origin master

# Update your copy
git pull


#########
#
# Merging a request
# 1 is the request number is this case
#
########

# Check out a new branch for integration
git checkout -b merge-requests/1

# Fetch the merge request into this branch
git pull \
  git://gitorious.org/opensuse-artwork/opensuse-artwork.git \
  refs/merge-requests/1

# Show the commits, assess they are okay
git log --pretty=oneline --abbrev-commit master..merge-requests/1

# To apply the changes to your branch:
git checkout master
git merge merge-requests/1
git push origin master