Andrew's git
/
gitweb.git
/ tree
summary
|
log
|
commit
|
diff
| tree
commit
grep
author
committer
pickaxe
?
re
history
|
HEAD
Documentation: document pitfalls with 3-way merge
[gitweb.git]
/
Documentation
/
drwxr-xr-x
parent (dest: ; base: c5665000327388832fa8be0b3bf17669f672481b)
-rw-r--r--
10679
CodingGuidelines
blob
|
history
|
raw
-rw-r--r--
12443
Makefile
blob
|
history
|
raw
drwxr-xr-x
-
RelNotes
tree
|
history
-rw-r--r--
17821
SubmittingPatches
blob
|
history
|
raw
-rw-r--r--
2393
asciidoc.conf
blob
|
history
|
raw
-rw-r--r--
3853
blame-options.txt
blob
|
history
|
raw
-rwxr-xr-x
968
build-docdep.perl
blob
|
history
|
raw
-rwxr-xr-x
776
cat-texi.perl
blob
|
history
|
raw
-rwxr-xr-x
1466
cmd-list.perl
blob
|
history
|
raw
-rw-r--r--
94342
config.txt
blob
|
history
|
raw
-rw-r--r--
848
date-formats.txt
blob
|
history
|
raw
-rw-r--r--
7035
diff-config.txt
blob
|
history
|
raw
-rw-r--r--
5570
diff-format.txt
blob
|
history
|
raw
-rw-r--r--
6597
diff-generate-patch.txt
blob
|
history
|
raw
-rw-r--r--
19599
diff-options.txt
blob
|
history
|
raw
-rw-r--r--
4557
docbook-xsl.css
blob
|
history
|
raw
-rw-r--r--
362
docbook.xsl
blob
|
history
|
raw
-rw-r--r--
13011
everyday.txt
blob
|
history
|
raw
-rw-r--r--
4326
fetch-options.txt
blob
|
history
|
raw
-rwxr-xr-x
309
fix-texi.perl
blob
|
history
|
raw
-rw-r--r--
14300
git-add.txt
blob
|
history
|
raw
-rw-r--r--
6164
git-am.txt
blob
|
history
|
raw
-rw-r--r--
752
git-annotate.txt
blob
|
history
|
raw
-rw-r--r--
9852
git-apply.txt
blob
|
history
|
raw
-rw-r--r--
3961
git-archimport.txt
blob
|
history
|
raw
-rw-r--r--
6195
git-archive.txt
blob
|
history
|
raw
-rw-r--r--
49229
git-bisect-lk2009.txt
blob
|
history
|
raw
-rw-r--r--
12681
git-bisect.txt
blob
|
history
|
raw
-rw-r--r--
7823
git-blame.txt
blob
|
history
|
raw
-rw-r--r--
10255
git-branch.txt
blob
|
history
|
raw
-rw-r--r--
7051
git-bundle.txt
blob
|
history
|
raw
-rw-r--r--
4693
git-cat-file.txt
blob
|
history
|
raw
-rw-r--r--
2996
git-check-attr.txt
blob
|
history
|
raw
-rw-r--r--
3450
git-check-ignore.txt
blob
|
history
|
raw
-rw-r--r--
946
git-check-mailmap.txt
blob
|
history
|
raw
-rw-r--r--
4173
git-check-ref-format.txt
blob
|
history
|
raw
-rw-r--r--
5440
git-checkout-index.txt
blob
|
history
|
raw
-rw-r--r--
15957
git-checkout.txt
blob
|
history
|
raw
-rw-r--r--
7913
git-cherry-pick.txt
blob
|
history
|
raw
-rw-r--r--
1748
git-cherry.txt
blob
|
history
|
raw
-rw-r--r--
543
git-citool.txt
blob
|
history
|
raw
-rw-r--r--
4140
git-clean.txt
blob
|
history
|
raw
-rw-r--r--
9899
git-clone.txt
blob
|
history
|
raw
-rw-r--r--
1171
git-column.txt
blob
|
history
|
raw
-rw-r--r--
2859
git-commit-tree.txt
blob
|
history
|
raw
-rw-r--r--
15321
git-commit.txt
blob
|
history
|
raw
-rw-r--r--
12258
git-config.txt
blob
|
history
|
raw
-rw-r--r--
1090
git-count-objects.txt
blob
|
history
|
raw
-rw-r--r--
684
git-credential-cache--daemon.txt
blob
|
history
|
raw
-rw-r--r--
2185
git-credential-cache.txt
blob
|
history
|
raw
-rw-r--r--
2165
git-credential-store.txt
blob
|
history
|
raw
-rw-r--r--
5857
git-credential.txt
blob
|
history
|
raw
-rw-r--r--
3209
git-cvsexportcommit.txt
blob
|
history
|
raw
-rw-r--r--
7751
git-cvsimport.txt
blob
|
history
|
raw
-rw-r--r--
15574
git-cvsserver.txt
blob
|
history
|
raw
-rw-r--r--
11856
git-daemon.txt
blob
|
history
|
raw
-rw-r--r--
6015
git-describe.txt
blob
|
history
|
raw
-rw-r--r--
1212
git-diff-files.txt
blob
|
history
|
raw
-rw-r--r--
4587
git-diff-index.txt
blob
|
history
|
raw
-rw-r--r--
5382
git-diff-tree.txt
blob
|
history
|
raw
-rw-r--r--
5503
git-diff.txt
blob
|
history
|
raw
-rw-r--r--
4119
git-difftool.txt
blob
|
history
|
raw
-rw-r--r--
5283
git-fast-export.txt
blob
|
history
|
raw
-rw-r--r--
55044
git-fast-import.txt
blob
|
history
|
raw
-rw-r--r--
3357
git-fetch-pack.txt
blob
|
history
|
raw
-rw-r--r--
2711
git-fetch.txt
blob
|
history
|
raw
-rw-r--r--
17242
git-filter-branch.txt
blob
|
history
|
raw
-rw-r--r--
1910
git-fmt-merge-msg.txt
blob
|
history
|
raw
-rw-r--r--
5858
git-for-each-ref.txt
blob
|
history
|
raw
-rw-r--r--
19498
git-format-patch.txt
blob
|
history
|
raw
-rw-r--r--
354
git-fsck-objects.txt
blob
|
history
|
raw
-rw-r--r--
4653
git-fsck.txt
blob
|
history
|
raw
-rw-r--r--
5526
git-gc.txt
blob
|
history
|
raw
-rw-r--r--
737
git-get-tar-commit-id.txt
blob
|
history
|
raw
-rw-r--r--
7732
git-grep.txt
blob
|
history
|
raw
-rw-r--r--
3588
git-gui.txt
blob
|
history
|
raw
-rw-r--r--
1844
git-hash-object.txt
blob
|
history
|
raw
-rw-r--r--
6138
git-help.txt
blob
|
history
|
raw
-rw-r--r--
9708
git-http-backend.txt
blob
|
history
|
raw
-rw-r--r--
1165
git-http-fetch.txt
blob
|
history
|
raw
-rw-r--r--
2975
git-http-push.txt
blob
|
history
|
raw
-rw-r--r--
4338
git-imap-send.txt
blob
|
history
|
raw
-rw-r--r--
3506
git-index-pack.txt
blob
|
history
|
raw
-rw-r--r--
409
git-init-db.txt
blob
|
history
|
raw
-rw-r--r--
4800
git-init.txt
blob
|
history
|
raw
-rw-r--r--
2301
git-instaweb.txt
blob
|
history
|
raw
-rw-r--r--
6405
git-log.txt
blob
|
history
|
raw
-rw-r--r--
1731
git-lost-found.txt
blob
|
history
|
raw
-rw-r--r--
6243
git-ls-files.txt
blob
|
history
|
raw
-rw-r--r--
2553
git-ls-remote.txt
blob
|
history
|
raw
-rw-r--r--
2999
git-ls-tree.txt
blob
|
history
|
raw
-rw-r--r--
3071
git-mailinfo.txt
blob
|
history
|
raw
-rw-r--r--
1238
git-mailsplit.txt
blob
|
history
|
raw
-rw-r--r--
4420
git-merge-base.txt
blob
|
history
|
raw
-rw-r--r--
2784
git-merge-file.txt
blob
|
history
|
raw
-rw-r--r--
2445
git-merge-index.txt
blob
|
history
|
raw
-rw-r--r--
387
git-merge-one-file.txt
blob
|
history
|
raw
-rw-r--r--
749
git-merge-tree.txt
blob
|
history
|
raw
-rw-r--r--
12367
git-merge.txt
blob
|
history
|
raw
-rw-r--r--
1208
git-mergetool--lib.txt
blob
|
history
|
raw
-rw-r--r--
3336
git-mergetool.txt
blob
|
history
|
raw
-rw-r--r--
806
git-mktag.txt
blob
|
history
|
raw
-rw-r--r--
1077
git-mktree.txt
blob
|
history
|
raw
-rw-r--r--
1183
git-mv.txt
blob
|
history
|
raw
-rw-r--r--
1931
git-name-rev.txt
blob
|
history
|
raw
-rw-r--r--
13399
git-notes.txt
blob
|
history
|
raw
-rw-r--r--
19239
git-p4.txt
blob
|
history
|
raw
-rw-r--r--
9076
git-pack-objects.txt
blob
|
history
|
raw
-rw-r--r--
1161
git-pack-redundant.txt
blob
|
history
|
raw
-rw-r--r--
2090
git-pack-refs.txt
blob
|
history
|
raw
-rw-r--r--
471
git-parse-remote.txt
blob
|
history
|
raw
-rw-r--r--
940
git-patch-id.txt
blob
|
history
|
raw
-rw-r--r--
1107
git-peek-remote.txt
blob
|
history
|
raw
-rw-r--r--
941
git-prune-packed.txt
blob
|
history
|
raw
-rw-r--r--
1797
git-prune.txt
blob
|
history
|
raw
-rw-r--r--
7907
git-pull.txt
blob
|
history
|
raw
-rw-r--r--
17378
git-push.txt
blob
|
history
|
raw
-rw-r--r--
1433
git-quiltimport.txt
blob
|
history
|
raw
-rw-r--r--
16748
git-read-tree.txt
blob
|
history
|
raw
-rw-r--r--
24717
git-rebase.txt
blob
|
history
|
raw
-rw-r--r--
5610
git-receive-pack.txt
blob
|
history
|
raw
-rw-r--r--
3483
git-reflog.txt
blob
|
history
|
raw
-rw-r--r--
649
git-relink.txt
blob
|
history
|
raw
-rw-r--r--
4029
git-remote-ext.txt
blob
|
history
|
raw
-rw-r--r--
1668
git-remote-fd.txt
blob
|
history
|
raw
-rw-r--r--
218
git-remote-helpers.txto
blob
|
history
|
raw
-rw-r--r--
570
git-remote-testgit.txt
blob
|
history
|
raw
-rw-r--r--
7233
git-remote.txt
blob
|
history
|
raw
-rw-r--r--
4631
git-repack.txt
blob
|
history
|
raw
-rw-r--r--
2315
git-replace.txt
blob
|
history
|
raw
-rw-r--r--
324
git-repo-config.txt
blob
|
history
|
raw
-rw-r--r--
528
git-request-pull.txt
blob
|
history
|
raw
-rw-r--r--
7460
git-rerere.txt
blob
|
history
|
raw
-rw-r--r--
14488
git-reset.txt
blob
|
history
|
raw
-rw-r--r--
3675
git-rev-list.txt
blob
|
history
|
raw
-rw-r--r--
10811
git-rev-parse.txt
blob
|
history
|
raw
-rw-r--r--
3781
git-revert.txt
blob
|
history
|
raw
-rw-r--r--
5816
git-rm.txt
blob
|
history
|
raw
-rw-r--r--
14540
git-send-email.txt
blob
|
history
|
raw
-rw-r--r--
3691
git-send-pack.txt
blob
|
history
|
raw
-rw-r--r--
928
git-sh-i18n--envsubst.txt
blob
|
history
|
raw
-rw-r--r--
1147
git-sh-i18n.txt
blob
|
history
|
raw
-rw-r--r--
2799
git-sh-setup.txt
blob
|
history
|
raw
-rw-r--r--
2531
git-shell.txt
blob
|
history
|
raw
-rw-r--r--
2634
git-shortlog.txt
blob
|
history
|
raw
-rw-r--r--
6517
git-show-branch.txt
blob
|
history
|
raw
-rw-r--r--
478
git-show-index.txt
blob
|
history
|
raw
-rw-r--r--
6058
git-show-ref.txt
blob
|
history
|
raw
-rw-r--r--
1801
git-show.txt
blob
|
history
|
raw
-rw-r--r--
300
git-stage.txt
blob
|
history
|
raw
-rw-r--r--
10530
git-stash.txt
blob
|
history
|
raw
-rw-r--r--
7955
git-status.txt
blob
|
history
|
raw
-rw-r--r--
1873
git-stripspace.txt
blob
|
history
|
raw
-rw-r--r--
15896
git-submodule.txt
blob
|
history
|
raw
-rw-r--r--
42531
git-svn.txt
blob
|
history
|
raw
-rw-r--r--
1981
git-symbolic-ref.txt
blob
|
history
|
raw
-rw-r--r--
10171
git-tag.txt
blob
|
history
|
raw
-rw-r--r--
2369
git-tar-tree.txt
blob
|
history
|
raw
-rw-r--r--
3436
git-tools.txt
blob
|
history
|
raw
-rw-r--r--
434
git-unpack-file.txt
blob
|
history
|
raw
-rw-r--r--
1168
git-unpack-objects.txt
blob
|
history
|
raw
-rw-r--r--
13520
git-update-index.txt
blob
|
history
|
raw
-rw-r--r--
3237
git-update-ref.txt
blob
|
history
|
raw
-rw-r--r--
797
git-update-server-info.txt
blob
|
history
|
raw
-rw-r--r--
617
git-upload-archive.txt
blob
|
history
|
raw
-rw-r--r--
869
git-upload-pack.txt
blob
|
history
|
raw
-rw-r--r--
1845
git-var.txt
blob
|
history
|
raw
-rw-r--r--
1097
git-verify-pack.txt
blob
|
history
|
raw
-rw-r--r--
411
git-verify-tag.txt
blob
|
history
|
raw
-rw-r--r--
3558
git-web--browse.txt
blob
|
history
|
raw
-rw-r--r--
1585
git-whatchanged.txt
blob
|
history
|
raw
-rw-r--r--
1026
git-write-tree.txt
blob
|
history
|
raw
-rw-r--r--
32176
git.txt
blob
|
history
|
raw
-rw-r--r--
34317
gitattributes.txt
blob
|
history
|
raw
-rw-r--r--
7931
gitcli.txt
blob
|
history
|
raw
-rw-r--r--
63822
gitcore-tutorial.txt
blob
|
history
|
raw
-rw-r--r--
6070
gitcredentials.txt
blob
|
history
|
raw
-rw-r--r--
7559
gitcvs-migration.txt
blob
|
history
|
raw
-rw-r--r--
11709
gitdiffcore.txt
blob
|
history
|
raw
-rw-r--r--
369
gitglossary.txt
blob
|
history
|
raw
-rw-r--r--
13801
githooks.txt
blob
|
history
|
raw
-rw-r--r--
6747
gitignore.txt
blob
|
history
|
raw
-rw-r--r--
3312
gitk.txt
blob
|
history
|
raw
-rw-r--r--
3850
gitmodules.txt
blob
|
history
|
raw
-rw-r--r--
3276
gitnamespaces.txt
blob
|
history
|
raw
-rw-r--r--
16465
gitremote-helpers.txt
blob
|
history
|
raw
-rw-r--r--
8140
gitrepository-layout.txt
blob
|
history
|
raw
-rw-r--r--
774
gitrevisions.txt
blob
|
history
|
raw
-rw-r--r--
14717
gittutorial-2.txt
blob
|
history
|
raw
-rw-r--r--
22964
gittutorial.txt
blob
|
history
|
raw
-rw-r--r--
39134
gitweb.conf.txt
blob
|
history
|
raw
-rw-r--r--
26976
gitweb.txt
blob
|
history
|
raw
-rw-r--r--
17404
gitworkflows.txt
blob
|
history
|
raw
-rw-r--r--
22522
glossary-content.txt
blob
|
history
|
raw
-rwxr-xr-x
669
howto-index.sh
blob
|
history
|
raw
drwxr-xr-x
-
howto
tree
|
history
-rw-r--r--
2210
i18n.txt
blob
|
history
|
raw
-rwxr-xr-x
771
install-doc-quick.sh
blob
|
history
|
raw
-rwxr-xr-x
754
install-webdoc.sh
blob
|
history
|
raw
-rw-r--r--
559
line-range-format.txt
blob
|
history
|
raw
-rw-r--r--
2407
mailmap.txt
blob
|
history
|
raw
-rw-r--r--
510
manpage-1.72.xsl
blob
|
history
|
raw
-rw-r--r--
320
manpage-base-url.xsl.in
blob
|
history
|
raw
-rw-r--r--
1192
manpage-base.xsl
blob
|
history
|
raw
-rw-r--r--
578
manpage-bold-literal.xsl
blob
|
history
|
raw
-rw-r--r--
475
manpage-normal.xsl
blob
|
history
|
raw
-rw-r--r--
585
manpage-quote-apos.xsl
blob
|
history
|
raw
-rw-r--r--
737
manpage-suppress-sp.xsl
blob
|
history
|
raw
-rw-r--r--
3549
merge-config.txt
blob
|
history
|
raw
-rw-r--r--
3685
merge-options.txt
blob
|
history
|
raw
-rw-r--r--
5212
merge-strategies.txt
blob
|
history
|
raw
-rw-r--r--
7777
pretty-formats.txt
blob
|
history
|
raw
-rw-r--r--
2875
pretty-options.txt
blob
|
history
|
raw
-rw-r--r--
3354
pull-fetch-param.txt
blob
|
history
|
raw
-rw-r--r--
28333
rev-list-options.txt
blob
|
history
|
raw
-rw-r--r--
11776
revisions.txt
blob
|
history
|
raw
-rw-r--r--
392
sequencer.txt
blob
|
history
|
raw
drwxr-xr-x
-
technical
tree
|
history
-rw-r--r--
2456
urls-remotes.txt
blob
|
history
|
raw
-rw-r--r--
3590
urls.txt
blob
|
history
|
raw
-rw-r--r--
432
user-manual.conf
blob
|
history
|
raw
-rw-r--r--
175074
user-manual.txt
blob
|
history
|
raw