repo.or.cz
/
git
/
mingw
/
j6t.git
/
tree
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
history
|
HEAD
|
snapshot (
tar.gz
zip
)
Add a second testcase for handling invalid strategies in git-merge
[git/mingw/j6t.git]
/
Documentation
/
tree
bf384cdf966493cad22c1b66e241dc279b2ea2b7
drwxr-xr-x
..
-rw-r--r--
17
.gitattributes
blob
|
blame
|
history
|
raw
-rw-r--r--
91
.gitignore
blob
|
blame
|
history
|
raw
-rw-r--r--
4469
CodingGuidelines
blob
|
blame
|
history
|
raw
-rw-r--r--
6017
Makefile
blob
|
blame
|
history
|
raw
-rw-r--r--
1255
RelNotes-1.5.0.1.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
2308
RelNotes-1.5.0.2.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
1577
RelNotes-1.5.0.3.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
462
RelNotes-1.5.0.4.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
609
RelNotes-1.5.0.5.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
484
RelNotes-1.5.0.6.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
482
RelNotes-1.5.0.7.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
18638
RelNotes-1.5.0.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
2164
RelNotes-1.5.1.1.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
1651
RelNotes-1.5.1.2.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
1566
RelNotes-1.5.1.3.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
843
RelNotes-1.5.1.4.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
1430
RelNotes-1.5.1.5.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
1519
RelNotes-1.5.1.6.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
13288
RelNotes-1.5.1.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
1584
RelNotes-1.5.2.1.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
2085
RelNotes-1.5.2.2.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
796
RelNotes-1.5.2.3.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
802
RelNotes-1.5.2.4.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
928
RelNotes-1.5.2.5.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
7354
RelNotes-1.5.2.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
326
RelNotes-1.5.3.1.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
1931
RelNotes-1.5.3.2.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
896
RelNotes-1.5.3.3.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
1208
RelNotes-1.5.3.4.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
3376
RelNotes-1.5.3.5.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
1432
RelNotes-1.5.3.6.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
1584
RelNotes-1.5.3.7.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
783
RelNotes-1.5.3.8.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
14030
RelNotes-1.5.3.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
524
RelNotes-1.5.4.1.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
1530
RelNotes-1.5.4.2.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
997
RelNotes-1.5.4.3.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
2618
RelNotes-1.5.4.4.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
2240
RelNotes-1.5.4.5.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
1440
RelNotes-1.5.4.6.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
14424
RelNotes-1.5.4.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
1499
RelNotes-1.5.5.1.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
772
RelNotes-1.5.5.2.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
305
RelNotes-1.5.5.3.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
140
RelNotes-1.5.5.4.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
449
RelNotes-1.5.5.5.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
7596
RelNotes-1.5.5.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
793
RelNotes-1.5.6.1.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
1457
RelNotes-1.5.6.2.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
2112
RelNotes-1.5.6.3.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
1573
RelNotes-1.5.6.4.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
3843
RelNotes-1.5.6.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
9143
RelNotes-1.6.0.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
17527
SubmittingPatches
blob
|
blame
|
history
|
raw
-rw-r--r--
1621
asciidoc.conf
blob
|
blame
|
history
|
raw
-rw-r--r--
2654
blame-options.txt
blob
|
blame
|
history
|
raw
-rwxr-xr-x
968
build-docdep.perl
blob
|
blame
|
history
|
raw
-rw-r--r--
1057
callouts.xsl
blob
|
blame
|
history
|
raw
-rwxr-xr-x
626
cat-texi.perl
blob
|
blame
|
history
|
raw
-rwxr-xr-x
1466
cmd-list.perl
blob
|
blame
|
history
|
raw
-rw-r--r--
47382
config.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
4816
diff-format.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
5689
diff-generate-patch.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
7300
diff-options.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
4399
docbook-xsl.css
blob
|
blame
|
history
|
raw
-rw-r--r--
249
docbook.xsl
blob
|
blame
|
history
|
raw
-rw-r--r--
14051
everyday.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
1903
fetch-options.txt
blob
|
blame
|
history
|
raw
-rwxr-xr-x
309
fix-texi.perl
blob
|
blame
|
history
|
raw
-rw-r--r--
8938
git-add.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
5086
git-am.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
512
git-annotate.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
7798
git-apply.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
4123
git-archimport.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
3313
git-archive.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
8760
git-bisect.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
6559
git-blame.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
7207
git-branch.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
5513
git-bundle.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
2822
git-cat-file.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
716
git-check-attr.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
1738
git-check-ref-format.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
5620
git-checkout-index.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
6816
git-checkout.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
2576
git-cherry-pick.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
1841
git-cherry.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
686
git-citool.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
1387
git-clean.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
6331
git-clone.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
2658
git-commit-tree.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
10849
git-commit.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
9758
git-config.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
781
git-count-objects.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
3249
git-cvsexportcommit.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
5632
git-cvsimport.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
12181
git-cvsserver.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
9898
git-daemon.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
4740
git-describe.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
1412
git-diff-files.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
4799
git-diff-index.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
5265
git-diff-tree.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
4983
git-diff.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
3239
git-fast-export.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
44297
git-fast-import.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
2902
git-fetch-pack.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
1296
git-fetch.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
12309
git-filter-branch.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
1498
git-fmt-merge-msg.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
5053
git-for-each-ref.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
7324
git-format-patch.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
304
git-fsck-objects.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
4775
git-fsck.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
4906
git-gc.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
901
git-get-tar-commit-id.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
3962
git-grep.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
3108
git-gui.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
1149
git-hash-object.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
5878
git-help.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
1217
git-http-fetch.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
3092
git-http-push.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
1108
git-imap-send.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
3268
git-index-pack.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
319
git-init-db.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
3975
git-init.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
2367
git-instaweb.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
2739
git-log.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
1856
git-lost-found.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
5692
git-ls-files.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
2217
git-ls-remote.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
3005
git-ls-tree.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
1931
git-mailinfo.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
1355
git-mailsplit.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
938
git-merge-base.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
2541
git-merge-file.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
2665
git-merge-index.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
626
git-merge-one-file.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
887
git-merge-tree.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
5270
git-merge.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
2558
git-mergetool.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
977
git-mktag.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
611
git-mktree.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
1396
git-mv.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
1917
git-name-rev.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
7809
git-pack-objects.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
1312
git-pack-redundant.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
1923
git-pack-refs.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
1368
git-parse-remote.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
1093
git-patch-id.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
1223
git-peek-remote.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
1031
git-prune-packed.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
1914
git-prune.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
6367
git-pull.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
7149
git-push.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
1571
git-quiltimport.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
14069
git-read-tree.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
12524
git-rebase.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
5697
git-receive-pack.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
3340
git-reflog.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
812
git-relink.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
3834
git-remote.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
4348
git-repack.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
274
git-repo-config.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
695
git-request-pull.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
7299
git-rerere.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
6726
git-reset.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
3203
git-rev-list.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
14479
git-rev-parse.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
1936
git-revert.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
3343
git-rm.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
8270
git-send-email.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
3773
git-send-pack.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
2152
git-sh-setup.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
820
git-shell.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
1735
git-shortlog.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
5985
git-show-branch.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
593
git-show-index.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
5697
git-show-ref.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
1849
git-show.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
7758
git-stash.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
2262
git-status.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
598
git-stripspace.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
6712
git-submodule.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
22596
git-svn.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
1909
git-symbolic-ref.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
8141
git-tag.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
2516
git-tar-tree.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
3435
git-tools.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
604
git-unpack-file.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
1280
git-unpack-objects.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
11827
git-update-index.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
3193
git-update-ref.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
1034
git-update-server-info.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
753
git-upload-archive.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
941
git-upload-pack.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
1295
git-var.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
979
git-verify-pack.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
528
git-verify-tag.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
3582
git-web--browse.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
1793
git-whatchanged.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
1134
git-write-tree.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
19623
git.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
16708
gitattributes.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
6487
gitcli.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
63335
gitcore-tutorial.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
7540
gitcvs-migration.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
11517
gitdiffcore.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
356
gitglossary.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
10715
githooks.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
5204
gitignore.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
2973
gitk.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
1455
gitmodules.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
7321
gitrepository-layout.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
14440
gittutorial-2.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
21519
gittutorial.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
19905
glossary-content.txt
blob
|
blame
|
history
|
raw
-rwxr-xr-x
669
howto-index.sh
blob
|
blame
|
history
|
raw
drwxr-xr-x
-
howto
tree
|
history
-rw-r--r--
2217
i18n.txt
blob
|
blame
|
history
|
raw
-rwxr-xr-x
724
install-doc-quick.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
764
install-webdoc.sh
blob
|
blame
|
history
|
raw
-rw-r--r--
757
manpage-1.72.xsl
blob
|
blame
|
history
|
raw
-rw-r--r--
1566
merge-config.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
1875
merge-options.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
1603
merge-strategies.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
3748
pretty-formats.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
1009
pretty-options.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
3113
pull-fetch-param.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
11709
rev-list-options.txt
blob
|
blame
|
history
|
raw
drwxr-xr-x
-
technical
tree
|
history
-rw-r--r--
2255
urls-remotes.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
2369
urls.txt
blob
|
blame
|
history
|
raw
-rw-r--r--
413
user-manual.conf
blob
|
blame
|
history
|
raw
-rw-r--r--
169063
user-manual.txt
blob
|
blame
|
history
|
raw