Skip to content

Commit 8dfda82

Browse files
authored
Merge pull request #7 from lowsprofile/belajarGit-versi-zdumb
beberapa file dirubah ke style markdown
2 parents 750f420 + 4d5e50d commit 8dfda82

File tree

7 files changed

+121
-109
lines changed

7 files changed

+121
-109
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Git Tutorial in Bahasa Indonesia.
1+
# Git Tutorial in Bahasa Indonesia.
22

33
Learning material for Git version control is widely available on the Net.
44
It is not the case in Bahasa Indonesia. Hence this tutorial.

git-workflow

Lines changed: 0 additions & 64 deletions
This file was deleted.

git-workflow.md

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
# Git Workflows
2+
##### Atau bisa dibilang cara kerja menggunakan Git
3+
4+
## Alumni Subversion
5+
#### Ciri khas :
6+
- Semua commit dicampur di trunk
7+
- Commit per online, bukan per task
8+
- Branch cuma untuk maintenance rilis
9+
10+
#### Cara kerja :
11+
- Clone repo
12+
```
13+
$ git clone myrepo
14+
```
15+
- Hacking / rubah code
16+
```
17+
$ git commit -am "log message"
18+
$ git pull
19+
```
20+
- Resolve conflicts
21+
```
22+
$ git push
23+
```
24+
25+
#### Outcome :
26+
- Commit gak jelas juntrungannya
27+
- Tiap commit tidak bisa di-apply sebagai patch yang solid
28+
- Merge commit di mana2
29+
30+
---------
31+
## Git Zealot
32+
#### Ciri khas :
33+
- Commit per task
34+
- Bikin branch even untuk ngerjain 1 commit doang
35+
- Rebase melulu
36+
37+
#### Cara kerja :
38+
- Clone project terus buat branch baru
39+
```
40+
$ git clone myrepo
41+
$ git checkout -b topic-branch
42+
```
43+
- Hack / rubah code
44+
- Pilih hunk yang mau distage
45+
```
46+
$ git add -i
47+
```
48+
- Commit terus Push ke branch baru yang telah dibuat
49+
```
50+
$ git commit -m "log message"
51+
$ git push origin topic-branch
52+
```
53+
- Jangan gunakan master untuk kerja, master hanya untuk track upstream.
54+
- Persiapan untuk rilis
55+
```
56+
$ git checkout master
57+
$ git remote add upstream
58+
$ git fetch upstream
59+
$ git merge master upstream/master
60+
$ git checkout topic-branch
61+
```
62+
- Pilih :
63+
- ```$ git rebase master``` (awas intermediate commit juga harus ditest)
64+
- ```$ git checkout master``` dan ```$ git merge topic-branch``` (jadi ada merge commit) -> preferred seperti katanya [nvie](http://nvie.com/posts/a-successful-git-branching-model/)
65+
- resolve conflicts
66+
- Commit
67+
```
68+
$ git commit -m "log message"
69+
```
70+
- Send pull request
71+
```
72+
$ git format-patch
73+
```
74+
- send untuk review/pull request
75+
76+
77+
#### Outcome :
78+
- Clean, linear history
79+
- Patch bisa di-apply secara clean
80+
- Tiap commit jelas urusannya
81+
- Butuh waktu lama untuk pilih2 hunk

instalasi-git-windows.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#Instalasi Git di Windows
2+
3+
##### Ada beberapa tools yang dapat Anda gunakan untuk menginstal Git di Windows :
4+
- Putty
5+
- Git for Windows
6+
- TortoiseGit
7+
8+
9+
## Putty
10+
1. Instalasi
11+
2. Generate keypair
12+
3. Save private key
13+
4. Export public key dalam format OpenSSH
14+
5. Kirim public key ke admin repo
15+
16+
## Git for Windows
17+
1. Unduh versi terakhirnya di https://github.com/git-for-windows/git/releases/
18+
2. Instalasi
19+
3. Jalankan
20+
21+
## TortoiseGit
22+
1. Unduh versi terakhirnya di https://tortoisegit.org/download/
23+
2. Instalasi
24+
3. Jalankan

instalasi-git-windows.txt

Lines changed: 0 additions & 19 deletions
This file was deleted.

workflow-basic

Lines changed: 0 additions & 25 deletions
This file was deleted.

workflow-basic.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Workflow Basic
2+
3+
```
4+
$ git clone
5+
$ git branch -a
6+
$ git checkout -b topic-branch
7+
$ // Hacking / rubah code
8+
$ git add .
9+
$ git commit -m "commit log"
10+
$ git checkout master
11+
$ git pull
12+
$ git merge topic-branch
13+
$ //Resolve conflicts
14+
$ git push
15+
```

0 commit comments

Comments
 (0)