Linux server.nvwebsoft.co.in 3.10.0-1160.114.2.el7.x86_64 #1 SMP Wed Mar 20 15:54:52 UTC 2024 x86_64
Apache
: 162.240.12.249 | : 13.59.217.1
202 Domain
8.1.31
nbspublicschool
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.8.3.1 /
[ HOME SHELL ]
Name
Size
Permission
Action
RelNotes
[ DIR ]
drwxr-xr-x
contrib
[ DIR ]
drwxr-xr-x
howto
[ DIR ]
drwxr-xr-x
technical
[ DIR ]
drwxr-xr-x
COPYING
18.33
KB
-rw-r--r--
README
2.56
KB
-rw-r--r--
blame-options.txt
3.95
KB
-rw-r--r--
cmds-ancillaryinterrogators.tx...
1.18
KB
-rw-r--r--
cmds-ancillarymanipulators.txt
1005
B
-rw-r--r--
cmds-foreignscminterface.txt
760
B
-rw-r--r--
cmds-mainporcelain.txt
2.5
KB
-rw-r--r--
cmds-plumbinginterrogators.txt
1.34
KB
-rw-r--r--
cmds-plumbingmanipulators.txt
1.21
KB
-rw-r--r--
cmds-purehelpers.txt
1.11
KB
-rw-r--r--
cmds-synchelpers.txt
543
B
-rw-r--r--
cmds-synchingrepositories.txt
397
B
-rw-r--r--
config.txt
90.14
KB
-rw-r--r--
date-formats.txt
848
B
-rw-r--r--
diff-config.txt
6.87
KB
-rw-r--r--
diff-format.txt
5.44
KB
-rw-r--r--
diff-generate-patch.txt
6.44
KB
-rw-r--r--
diff-options.txt
18.12
KB
-rw-r--r--
docbook-xsl.css
4.45
KB
-rw-r--r--
everyday.html
35.06
KB
-rw-r--r--
everyday.txt
12.71
KB
-rw-r--r--
fetch-options.txt
4.22
KB
-rw-r--r--
git-add.html
35.63
KB
-rw-r--r--
git-add.txt
13.96
KB
-rw-r--r--
git-am.html
25.86
KB
-rw-r--r--
git-am.txt
6.02
KB
-rw-r--r--
git-annotate.html
23.32
KB
-rw-r--r--
git-annotate.txt
752
B
-rw-r--r--
git-apply.html
30.82
KB
-rw-r--r--
git-apply.txt
10.07
KB
-rw-r--r--
git-archive.html
25.88
KB
-rw-r--r--
git-archive.txt
6.05
KB
-rw-r--r--
git-bisect-lk2009.html
78.86
KB
-rw-r--r--
git-bisect-lk2009.txt
48.08
KB
-rw-r--r--
git-bisect.html
33.08
KB
-rw-r--r--
git-bisect.txt
12.38
KB
-rw-r--r--
git-blame.html
37.08
KB
-rw-r--r--
git-blame.txt
7.63
KB
-rw-r--r--
git-branch.html
31.29
KB
-rw-r--r--
git-branch.txt
9.87
KB
-rw-r--r--
git-bundle.html
25.72
KB
-rw-r--r--
git-bundle.txt
6.89
KB
-rw-r--r--
git-cat-file.html
21.04
KB
-rw-r--r--
git-cat-file.txt
2.9
KB
-rw-r--r--
git-check-attr.html
21.17
KB
-rw-r--r--
git-check-attr.txt
2.72
KB
-rw-r--r--
git-check-ignore.html
20.25
KB
-rw-r--r--
git-check-ignore.txt
2.35
KB
-rw-r--r--
git-check-ref-format.html
22.43
KB
-rw-r--r--
git-check-ref-format.txt
4.08
KB
-rw-r--r--
git-checkout-index.html
24.34
KB
-rw-r--r--
git-checkout-index.txt
5.31
KB
-rw-r--r--
git-checkout.html
38.47
KB
-rw-r--r--
git-checkout.txt
15.61
KB
-rw-r--r--
git-cherry-pick.html
28.28
KB
-rw-r--r--
git-cherry-pick.txt
7.73
KB
-rw-r--r--
git-cherry.html
19.15
KB
-rw-r--r--
git-cherry.txt
1.71
KB
-rw-r--r--
git-citool.html
17.13
KB
-rw-r--r--
git-citool.txt
543
B
-rw-r--r--
git-clean.html
19.45
KB
-rw-r--r--
git-clean.txt
1.92
KB
-rw-r--r--
git-clone.html
34.75
KB
-rw-r--r--
git-clone.txt
9.84
KB
-rw-r--r--
git-column.html
18.47
KB
-rw-r--r--
git-column.txt
1.14
KB
-rw-r--r--
git-commit-tree.html
25.04
KB
-rw-r--r--
git-commit-tree.txt
2.79
KB
-rw-r--r--
git-commit.html
43.18
KB
-rw-r--r--
git-commit.txt
14.96
KB
-rw-r--r--
git-config.html
181.42
KB
-rw-r--r--
git-config.txt
11.52
KB
-rw-r--r--
git-count-objects.html
18.11
KB
-rw-r--r--
git-count-objects.txt
1.06
KB
-rw-r--r--
git-credential-cache--daemon.h...
17.4
KB
-rw-r--r--
git-credential-cache--daemon.t...
684
B
-rw-r--r--
git-credential-cache.html
19.26
KB
-rw-r--r--
git-credential-cache.txt
2.13
KB
-rw-r--r--
git-credential-store.html
19.42
KB
-rw-r--r--
git-credential-store.txt
2.11
KB
-rw-r--r--
git-credential.html
23.82
KB
-rw-r--r--
git-credential.txt
5.72
KB
-rw-r--r--
git-cvsexportcommit.html
21.34
KB
-rw-r--r--
git-cvsexportcommit.txt
3.13
KB
-rw-r--r--
git-cvsimport.html
27.62
KB
-rw-r--r--
git-cvsimport.txt
7.57
KB
-rw-r--r--
git-cvsserver.html
38.1
KB
-rw-r--r--
git-cvsserver.txt
15.21
KB
-rw-r--r--
git-daemon.html
32.69
KB
-rw-r--r--
git-daemon.txt
11.58
KB
-rw-r--r--
git-describe.html
24.35
KB
-rw-r--r--
git-describe.txt
5.59
KB
-rw-r--r--
git-diff-files.html
59.9
KB
-rw-r--r--
git-diff-files.txt
1.18
KB
-rw-r--r--
git-diff-index.html
64.69
KB
-rw-r--r--
git-diff-index.txt
4.49
KB
-rw-r--r--
git-diff-tree.html
82.31
KB
-rw-r--r--
git-diff-tree.txt
5.26
KB
-rw-r--r--
git-diff.html
66.63
KB
-rw-r--r--
git-diff.txt
5.34
KB
-rw-r--r--
git-difftool.html
22.93
KB
-rw-r--r--
git-difftool.txt
4.02
KB
-rw-r--r--
git-fast-export.html
23.45
KB
-rw-r--r--
git-fast-export.txt
5.16
KB
-rw-r--r--
git-fast-import.html
92.66
KB
-rw-r--r--
git-fast-import.txt
53.75
KB
-rw-r--r--
git-fetch-pack.html
21.26
KB
-rw-r--r--
git-fetch-pack.txt
3.28
KB
-rw-r--r--
git-fetch.html
38.95
KB
-rw-r--r--
git-fetch.txt
2.65
KB
-rw-r--r--
git-filter-branch.html
37.67
KB
-rw-r--r--
git-filter-branch.txt
16.84
KB
-rw-r--r--
git-fmt-merge-msg.html
19.55
KB
-rw-r--r--
git-fmt-merge-msg.txt
1.87
KB
-rw-r--r--
git-for-each-ref.html
25.45
KB
-rw-r--r--
git-for-each-ref.txt
5.72
KB
-rw-r--r--
git-format-patch.html
58.91
KB
-rw-r--r--
git-format-patch.txt
18.38
KB
-rw-r--r--
git-fsck-objects.html
16.88
KB
-rw-r--r--
git-fsck-objects.txt
354
B
-rw-r--r--
git-fsck.html
23.33
KB
-rw-r--r--
git-fsck.txt
4.54
KB
-rw-r--r--
git-gc.html
23.82
KB
-rw-r--r--
git-gc.txt
5.34
KB
-rw-r--r--
git-get-tar-commit-id.html
17.32
KB
-rw-r--r--
git-get-tar-commit-id.txt
737
B
-rw-r--r--
git-grep.html
29.02
KB
-rw-r--r--
git-grep.txt
7.55
KB
-rw-r--r--
git-gui.html
22.1
KB
-rw-r--r--
git-gui.txt
3.5
KB
-rw-r--r--
git-hash-object.html
18.92
KB
-rw-r--r--
git-hash-object.txt
1.8
KB
-rw-r--r--
git-help.html
25.14
KB
-rw-r--r--
git-help.txt
5.99
KB
-rw-r--r--
git-http-backend.html
28.46
KB
-rw-r--r--
git-http-backend.txt
9.48
KB
-rw-r--r--
git-http-fetch.html
18.41
KB
-rw-r--r--
git-http-fetch.txt
1.14
KB
-rw-r--r--
git-http-push.html
20.73
KB
-rw-r--r--
git-http-push.txt
2.91
KB
-rw-r--r--
git-imap-send.html
22.84
KB
-rw-r--r--
git-imap-send.txt
4.24
KB
-rw-r--r--
git-index-pack.html
21.01
KB
-rw-r--r--
git-index-pack.txt
3.32
KB
-rw-r--r--
git-init-db.html
16.95
KB
-rw-r--r--
git-init-db.txt
409
B
-rw-r--r--
git-init.html
23
KB
-rw-r--r--
git-init.txt
4.69
KB
-rw-r--r--
git-instaweb.html
20.06
KB
-rw-r--r--
git-instaweb.txt
2.25
KB
-rw-r--r--
git-log.html
111.87
KB
-rw-r--r--
git-log.txt
5.68
KB
-rw-r--r--
git-lost-found.html
18.83
KB
-rw-r--r--
git-lost-found.txt
1.69
KB
-rw-r--r--
git-ls-files.html
26.46
KB
-rw-r--r--
git-ls-files.txt
6.1
KB
-rw-r--r--
git-ls-remote.html
20.11
KB
-rw-r--r--
git-ls-remote.txt
2.54
KB
-rw-r--r--
git-ls-tree.html
21.06
KB
-rw-r--r--
git-ls-tree.txt
2.93
KB
-rw-r--r--
git-mailinfo.html
20.78
KB
-rw-r--r--
git-mailinfo.txt
3
KB
-rw-r--r--
git-mailsplit.html
18.52
KB
-rw-r--r--
git-mailsplit.txt
1.21
KB
-rw-r--r--
git-merge-base.html
23.17
KB
-rw-r--r--
git-merge-base.txt
4.32
KB
-rw-r--r--
git-merge-file.html
20.71
KB
-rw-r--r--
git-merge-file.txt
2.72
KB
-rw-r--r--
git-merge-index.html
19.88
KB
-rw-r--r--
git-merge-index.txt
2.39
KB
-rw-r--r--
git-merge-one-file.html
16.9
KB
-rw-r--r--
git-merge-one-file.txt
387
B
-rw-r--r--
git-merge-tree.html
17.32
KB
-rw-r--r--
git-merge-tree.txt
749
B
-rw-r--r--
git-merge.html
50.38
KB
-rw-r--r--
git-merge.txt
11.97
KB
-rw-r--r--
git-mergetool--lib.html
18.23
KB
-rw-r--r--
git-mergetool--lib.txt
1.18
KB
-rw-r--r--
git-mergetool.html
20.98
KB
-rw-r--r--
git-mergetool.txt
3.26
KB
-rw-r--r--
git-mktag.html
17.63
KB
-rw-r--r--
git-mktag.txt
806
B
-rw-r--r--
git-mktree.html
17.94
KB
-rw-r--r--
git-mktree.txt
1.05
KB
-rw-r--r--
git-mv.html
18.33
KB
-rw-r--r--
git-mv.txt
1.16
KB
-rw-r--r--
git-name-rev.html
19.17
KB
-rw-r--r--
git-name-rev.txt
1.68
KB
-rw-r--r--
git-notes.html
35.71
KB
-rw-r--r--
git-notes.txt
13.08
KB
-rw-r--r--
git-p4.html
44.35
KB
-rw-r--r--
git-p4.txt
18.73
KB
-rw-r--r--
git-pack-objects.html
28.46
KB
-rw-r--r--
git-pack-objects.txt
8.86
KB
-rw-r--r--
git-pack-redundant.html
18.24
KB
-rw-r--r--
git-pack-redundant.txt
1.13
KB
-rw-r--r--
git-pack-refs.html
19.15
KB
-rw-r--r--
git-pack-refs.txt
2.06
KB
-rw-r--r--
git-parse-remote.html
16.97
KB
-rw-r--r--
git-parse-remote.txt
471
B
-rw-r--r--
git-patch-id.html
17.71
KB
-rw-r--r--
git-patch-id.txt
940
B
-rw-r--r--
git-peek-remote.html
18.03
KB
-rw-r--r--
git-peek-remote.txt
1.08
KB
-rw-r--r--
git-prune-packed.html
17.99
KB
-rw-r--r--
git-prune-packed.txt
935
B
-rw-r--r--
git-prune.html
19.57
KB
-rw-r--r--
git-prune.txt
1.76
KB
-rw-r--r--
git-pull.html
54.96
KB
-rw-r--r--
git-pull.txt
7.72
KB
-rw-r--r--
git-push.html
48.49
KB
-rw-r--r--
git-push.txt
16.26
KB
-rw-r--r--
git-quiltimport.html
18.4
KB
-rw-r--r--
git-quiltimport.txt
1.4
KB
-rw-r--r--
git-read-tree.html
38.05
KB
-rw-r--r--
git-read-tree.txt
16.36
KB
-rw-r--r--
git-rebase.html
57.88
KB
-rw-r--r--
git-rebase.txt
23.62
KB
-rw-r--r--
git-receive-pack.html
23.98
KB
-rw-r--r--
git-receive-pack.txt
5.48
KB
-rw-r--r--
git-reflog.html
20.86
KB
-rw-r--r--
git-reflog.txt
3.09
KB
-rw-r--r--
git-relink.html
17.41
KB
-rw-r--r--
git-relink.txt
649
B
-rw-r--r--
git-remote-ext.html
22.43
KB
-rw-r--r--
git-remote-ext.txt
3.93
KB
-rw-r--r--
git-remote-fd.html
19
KB
-rw-r--r--
git-remote-fd.txt
1.63
KB
-rw-r--r--
git-remote-helpers.html
16.45
KB
-rw-r--r--
git-remote-testgit.html
17.26
KB
-rw-r--r--
git-remote-testgit.txt
570
B
-rw-r--r--
git-remote.html
26.62
KB
-rw-r--r--
git-remote.txt
6.79
KB
-rw-r--r--
git-repack.html
22.99
KB
-rw-r--r--
git-repack.txt
4.52
KB
-rw-r--r--
git-replace.html
19.86
KB
-rw-r--r--
git-replace.txt
2.26
KB
-rw-r--r--
git-repo-config.html
16.85
KB
-rw-r--r--
git-repo-config.txt
324
B
-rw-r--r--
git-request-pull.html
17.41
KB
-rw-r--r--
git-request-pull.txt
528
B
-rw-r--r--
git-rerere.html
25.93
KB
-rw-r--r--
git-rerere.txt
7.29
KB
-rw-r--r--
git-reset.html
36.54
KB
-rw-r--r--
git-reset.txt
14.15
KB
-rw-r--r--
git-rev-list.html
73.64
KB
-rw-r--r--
git-rev-list.txt
3.59
KB
-rw-r--r--
git-rev-parse.html
46.91
KB
-rw-r--r--
git-rev-parse.txt
10.03
KB
-rw-r--r--
git-revert.html
22.61
KB
-rw-r--r--
git-revert.txt
3.69
KB
-rw-r--r--
git-rm.html
24.83
KB
-rw-r--r--
git-rm.txt
5.68
KB
-rw-r--r--
git-send-email.html
36.99
KB
-rw-r--r--
git-send-email.txt
13.93
KB
-rw-r--r--
git-send-pack.html
21.8
KB
-rw-r--r--
git-send-pack.txt
3.6
KB
-rw-r--r--
git-sh-i18n--envsubst.html
17.64
KB
-rw-r--r--
git-sh-i18n--envsubst.txt
928
B
-rw-r--r--
git-sh-i18n.html
18.06
KB
-rw-r--r--
git-sh-i18n.txt
1.12
KB
-rw-r--r--
git-sh-setup.html
20.46
KB
-rw-r--r--
git-sh-setup.txt
2.73
KB
-rw-r--r--
git-shell.html
20.25
KB
-rw-r--r--
git-shell.txt
2.47
KB
-rw-r--r--
git-shortlog.html
24.29
KB
-rw-r--r--
git-shortlog.txt
2.57
KB
-rw-r--r--
git-show-branch.html
25.52
KB
-rw-r--r--
git-show-branch.txt
6.36
KB
-rw-r--r--
git-show-index.html
17.03
KB
-rw-r--r--
git-show-index.txt
478
B
-rw-r--r--
git-show-ref.html
24.15
KB
-rw-r--r--
git-show-ref.txt
5.83
KB
-rw-r--r--
git-show.html
38.73
KB
-rw-r--r--
git-show.txt
1.64
KB
-rw-r--r--
git-stage.html
16.82
KB
-rw-r--r--
git-stage.txt
300
B
-rw-r--r--
git-stash.html
29.25
KB
-rw-r--r--
git-stash.txt
9.85
KB
-rw-r--r--
git-status.html
27.38
KB
-rw-r--r--
git-status.txt
7.77
KB
-rw-r--r--
git-stripspace.html
19.37
KB
-rw-r--r--
git-stripspace.txt
1.83
KB
-rw-r--r--
git-submodule.html
36.33
KB
-rw-r--r--
git-submodule.txt
15.13
KB
-rw-r--r--
git-svn.html
73.85
KB
-rw-r--r--
git-svn.txt
41.53
KB
-rw-r--r--
git-symbolic-ref.html
19.37
KB
-rw-r--r--
git-symbolic-ref.txt
1.93
KB
-rw-r--r--
git-tag.html
31.51
KB
-rw-r--r--
git-tag.txt
9.44
KB
-rw-r--r--
git-tar-tree.html
20.04
KB
-rw-r--r--
git-tar-tree.txt
2.31
KB
-rw-r--r--
git-tools.html
22.01
KB
-rw-r--r--
git-tools.txt
3.36
KB
-rw-r--r--
git-unpack-file.html
17.13
KB
-rw-r--r--
git-unpack-file.txt
434
B
-rw-r--r--
git-unpack-objects.html
18.15
KB
-rw-r--r--
git-unpack-objects.txt
1.14
KB
-rw-r--r--
git-update-index.html
35.2
KB
-rw-r--r--
git-update-index.txt
13.2
KB
-rw-r--r--
git-update-ref.html
20.82
KB
-rw-r--r--
git-update-ref.txt
3.16
KB
-rw-r--r--
git-update-server-info.html
17.72
KB
-rw-r--r--
git-update-server-info.txt
797
B
-rw-r--r--
git-upload-archive.html
17.35
KB
-rw-r--r--
git-upload-archive.txt
617
B
-rw-r--r--
git-upload-pack.html
17.88
KB
-rw-r--r--
git-upload-pack.txt
869
B
-rw-r--r--
git-var.html
19.08
KB
-rw-r--r--
git-var.txt
1.8
KB
-rw-r--r--
git-verify-pack.html
18.39
KB
-rw-r--r--
git-verify-pack.txt
1.07
KB
-rw-r--r--
git-verify-tag.html
17.2
KB
-rw-r--r--
git-verify-tag.txt
411
B
-rw-r--r--
git-web--browse.html
21.63
KB
-rw-r--r--
git-web--browse.txt
3.43
KB
-rw-r--r--
git-whatchanged.html
35.64
KB
-rw-r--r--
git-whatchanged.txt
1.55
KB
-rw-r--r--
git-write-tree.html
17.91
KB
-rw-r--r--
git-write-tree.txt
1
KB
-rw-r--r--
git.html
70.05
KB
-rw-r--r--
git.txt
31.8
KB
-rw-r--r--
gitattributes.html
62.01
KB
-rw-r--r--
gitattributes.txt
33.51
KB
-rw-r--r--
gitcli.html
26.56
KB
-rw-r--r--
gitcli.txt
7.75
KB
-rw-r--r--
gitcore-tutorial.html
99.92
KB
-rw-r--r--
gitcore-tutorial.txt
62.33
KB
-rw-r--r--
gitcredentials.html
24.45
KB
-rw-r--r--
gitcredentials.txt
5.93
KB
-rw-r--r--
gitcvs-migration.html
26.03
KB
-rw-r--r--
gitcvs-migration.txt
7.38
KB
-rw-r--r--
gitdiffcore.html
29.51
KB
-rw-r--r--
gitdiffcore.txt
10.78
KB
-rw-r--r--
gitglossary.html
48.63
KB
-rw-r--r--
gitglossary.txt
369
B
-rw-r--r--
githooks.html
35.01
KB
-rw-r--r--
githooks.txt
13.48
KB
-rw-r--r--
gitignore.html
24.81
KB
-rw-r--r--
gitignore.txt
6.58
KB
-rw-r--r--
gitk.html
21.61
KB
-rw-r--r--
gitk.txt
3.23
KB
-rw-r--r--
gitmodules.html
21.72
KB
-rw-r--r--
gitmodules.txt
3.76
KB
-rw-r--r--
gitnamespaces.html
20.5
KB
-rw-r--r--
gitnamespaces.txt
3.2
KB
-rw-r--r--
gitremote-helpers.html
39.11
KB
-rw-r--r--
gitremote-helpers.txt
16.06
KB
-rw-r--r--
gitrepository-layout.html
28.1
KB
-rw-r--r--
gitrepository-layout.txt
7.95
KB
-rw-r--r--
gitrevisions.html
32.66
KB
-rw-r--r--
gitrevisions.txt
774
B
-rw-r--r--
gittutorial-2.html
33.55
KB
-rw-r--r--
gittutorial-2.txt
14.37
KB
-rw-r--r--
gittutorial.html
44.41
KB
-rw-r--r--
gittutorial.txt
22.43
KB
-rw-r--r--
gitweb.conf.html
66.11
KB
-rw-r--r--
gitweb.conf.txt
37.3
KB
-rw-r--r--
gitweb.html
50.94
KB
-rw-r--r--
gitweb.txt
26.34
KB
-rw-r--r--
gitworkflows.html
38.85
KB
-rw-r--r--
gitworkflows.txt
17
KB
-rw-r--r--
glossary-content.txt
21.95
KB
-rw-r--r--
howto-index.html
21.31
KB
-rw-r--r--
howto-index.txt
3.29
KB
-rw-r--r--
i18n.txt
2.16
KB
-rw-r--r--
mailmap.txt
2.35
KB
-rw-r--r--
merge-config.txt
3.47
KB
-rw-r--r--
merge-options.txt
3.58
KB
-rw-r--r--
merge-strategies.txt
4.6
KB
-rw-r--r--
mergetools-diff.txt
181
B
-rw-r--r--
mergetools-merge.txt
187
B
-rw-r--r--
pretty-formats.txt
7.59
KB
-rw-r--r--
pretty-options.txt
2.81
KB
-rw-r--r--
pull-fetch-param.txt
3.19
KB
-rw-r--r--
rev-list-options.txt
27.11
KB
-rw-r--r--
revisions.txt
11.5
KB
-rw-r--r--
sequencer.txt
392
B
-rw-r--r--
urls-remotes.txt
2.4
KB
-rw-r--r--
urls.txt
3.12
KB
-rw-r--r--
user-manual.html
264.08
KB
-rw-r--r--
user-manual.txt
170.67
KB
-rw-r--r--
Delete
Unzip
Zip
${this.title}
Close
Code Editor : git-merge-base.txt
git-merge-base(1) ================= NAME ---- git-merge-base - Find as good common ancestors as possible for a merge SYNOPSIS -------- [verse] 'git merge-base' [-a|--all] <commit> <commit>... 'git merge-base' [-a|--all] --octopus <commit>... 'git merge-base' --is-ancestor <commit> <commit> 'git merge-base' --independent <commit>... DESCRIPTION ----------- 'git merge-base' finds best common ancestor(s) between two commits to use in a three-way merge. One common ancestor is 'better' than another common ancestor if the latter is an ancestor of the former. A common ancestor that does not have any better common ancestor is a 'best common ancestor', i.e. a 'merge base'. Note that there can be more than one merge base for a pair of commits. OPERATION MODE -------------- As the most common special case, specifying only two commits on the command line means computing the merge base between the given two commits. More generally, among the two commits to compute the merge base from, one is specified by the first commit argument on the command line; the other commit is a (possibly hypothetical) commit that is a merge across all the remaining commits on the command line. As a consequence, the 'merge base' is not necessarily contained in each of the commit arguments if more than two commits are specified. This is different from linkgit:git-show-branch[1] when used with the `--merge-base` option. --octopus:: Compute the best common ancestors of all supplied commits, in preparation for an n-way merge. This mimics the behavior of 'git show-branch --merge-base'. --independent:: Instead of printing merge bases, print a minimal subset of the supplied commits with the same ancestors. In other words, among the commits given, list those which cannot be reached from any other. This mimics the behavior of 'git show-branch --independent'. --is-ancestor:: Check if the first <commit> is an ancestor of the second <commit>, and exit with status 0 if true, or with status 1 if not. Errors are signaled by a non-zero status that is not 1. OPTIONS ------- -a:: --all:: Output all merge bases for the commits, instead of just one. DISCUSSION ---------- Given two commits 'A' and 'B', `git merge-base A B` will output a commit which is reachable from both 'A' and 'B' through the parent relationship. For example, with this topology: o---o---o---B / ---o---1---o---o---o---A the merge base between 'A' and 'B' is '1'. Given three commits 'A', 'B' and 'C', `git merge-base A B C` will compute the merge base between 'A' and a hypothetical commit 'M', which is a merge between 'B' and 'C'. For example, with this topology: o---o---o---o---C / / o---o---o---B / / ---2---1---o---o---o---A the result of `git merge-base A B C` is '1'. This is because the equivalent topology with a merge commit 'M' between 'B' and 'C' is: o---o---o---o---o / \ / o---o---o---o---M / / ---2---1---o---o---o---A and the result of `git merge-base A M` is '1'. Commit '2' is also a common ancestor between 'A' and 'M', but '1' is a better common ancestor, because '2' is an ancestor of '1'. Hence, '2' is not a merge base. The result of `git merge-base --octopus A B C` is '2', because '2' is the best common ancestor of all commits. When the history involves criss-cross merges, there can be more than one 'best' common ancestor for two commits. For example, with this topology: ---1---o---A \ / X / \ ---2---o---o---B both '1' and '2' are merge-bases of A and B. Neither one is better than the other (both are 'best' merge bases). When the `--all` option is not given, it is unspecified which best one is output. A common idiom to check "fast-forward-ness" between two commits A and B is (or at least used to be) to compute the merge base between A and B, and check if it is the same as A, in which case, A is an ancestor of B. You will see this idiom used often in older scripts. A=$(git rev-parse --verify A) if test "$A" = "$(git merge-base A B)" then ... A is an ancestor of B ... fi In modern git, you can say this in a more direct way: if git merge-base --is-ancestor A B then ... A is an ancestor of B ... fi instead. See also -------- linkgit:git-rev-list[1], linkgit:git-show-branch[1], linkgit:git-merge[1] GIT --- Part of the linkgit:git[1] suite
Close