repo.or.cz
/
tgit.git
/
tree
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
snapshot (
tar.gz
zip
)
[PATCH] Finish documenting trivial merge rules
tree
572ada7f126f8bfad8a9fb914d2f85d4a82c6b35
-rw-r--r--
1364
.gitignore
blob
|
blame
|
history
|
raw
-rw-r--r--
18787
COPYING
blob
|
blame
|
history
|
raw
drwxr-xr-x
-
Documentation
tree
|
history
-rw-r--r--
2918
INSTALL
blob
|
blame
|
history
|
raw
-rw-r--r--
10433
Makefile
blob
|
blame
|
history
|
raw
-rw-r--r--
23942
README
blob
|
blame
|
history
|
raw
-rw-r--r--
35097
apply.c
blob
|
blame
|
history
|
raw
drwxr-xr-x
-
arm
tree
|
history
-rw-r--r--
1304
blob.c
blob
|
blame
|
history
|
raw
-rw-r--r--
311
blob.h
blob
|
blame
|
history
|
raw
-rw-r--r--
11476
cache.h
blob
|
blame
|
history
|
raw
-rw-r--r--
1092
cat-file.c
blob
|
blame
|
history
|
raw
-rw-r--r--
3678
checkout-index.c
blob
|
blame
|
history
|
raw
-rw-r--r--
4107
clone-pack.c
blob
|
blame
|
history
|
raw
-rwxr-xr-x
1590
cmd-rename.sh
blob
|
blame
|
history
|
raw
-rw-r--r--
3147
commit-tree.c
blob
|
blame
|
history
|
raw
-rw-r--r--
13855
commit.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1982
commit.h
blob
|
blame
|
history
|
raw
drwxr-xr-x
-
compat
tree
|
history
-rw-r--r--
9411
connect.c
blob
|
blame
|
history
|
raw
-rw-r--r--
7234
convert-objects.c
blob
|
blame
|
history
|
raw
-rw-r--r--
2261
count-delta.c
blob
|
blame
|
history
|
raw
-rw-r--r--
196
count-delta.h
blob
|
blame
|
history
|
raw
-rw-r--r--
2978
csum-file.c
blob
|
blame
|
history
|
raw
-rw-r--r--
566
csum-file.h
blob
|
blame
|
history
|
raw
-rw-r--r--
10396
daemon.c
blob
|
blame
|
history
|
raw
-rw-r--r--
10521
date.c
blob
|
blame
|
history
|
raw
drwxr-xr-x
-
debian
tree
|
history
-rw-r--r--
919
delta.h
blob
|
blame
|
history
|
raw
-rw-r--r--
7308
diff-delta.c
blob
|
blame
|
history
|
raw
-rw-r--r--
4177
diff-files.c
blob
|
blame
|
history
|
raw
-rw-r--r--
6974
diff-index.c
blob
|
blame
|
history
|
raw
-rw-r--r--
3539
diff-stages.c
blob
|
blame
|
history
|
raw
-rw-r--r--
13322
diff-tree.c
blob
|
blame
|
history
|
raw
-rw-r--r--
29432
diff.c
blob
|
blame
|
history
|
raw
-rw-r--r--
2741
diff.h
blob
|
blame
|
history
|
raw
-rw-r--r--
8557
diffcore-break.c
blob
|
blame
|
history
|
raw
-rw-r--r--
2258
diffcore-order.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1218
diffcore-pathspec.c
blob
|
blame
|
history
|
raw
-rw-r--r--
2541
diffcore-pickaxe.c
blob
|
blame
|
history
|
raw
-rw-r--r--
12737
diffcore-rename.c
blob
|
blame
|
history
|
raw
-rw-r--r--
3481
diffcore.h
blob
|
blame
|
history
|
raw
-rw-r--r--
3715
entry.c
blob
|
blame
|
history
|
raw
-rw-r--r--
17342
epoch.c
blob
|
blame
|
history
|
raw
-rw-r--r--
476
epoch.h
blob
|
blame
|
history
|
raw
-rw-r--r--
3738
fetch-pack.c
blob
|
blame
|
history
|
raw
-rw-r--r--
4773
fetch.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1318
fetch.h
blob
|
blame
|
history
|
raw
-rw-r--r--
12671
fsck-objects.c
blob
|
blame
|
history
|
raw
-rw-r--r--
514
get-tar-commit-id.c
blob
|
blame
|
history
|
raw
-rwxr-xr-x
524
git-add.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
2694
git-applymbox.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
2668
git-applypatch.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
23377
git-archimport.perl
blob
|
blame
|
history
|
raw
-rwxr-xr-x
5179
git-bisect.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
2099
git-branch.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
1695
git-checkout.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
1824
git-cherry.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
4439
git-clone.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
5198
git-commit.sh
blob
|
blame
|
history
|
raw
-rw-r--r--
2750
git-core.spec.in
blob
|
blame
|
history
|
raw
-rwxr-xr-x
346
git-count-objects.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
20825
git-cvsimport.perl
blob
|
blame
|
history
|
raw
-rwxr-xr-x
940
git-diff.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
1490
git-external-diff-script
blob
|
blame
|
history
|
raw
-rwxr-xr-x
6316
git-fetch.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
1788
git-fmt-merge-msg.perl
blob
|
blame
|
history
|
raw
-rwxr-xr-x
5191
git-format-patch.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
653
git-grep.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
351
git-log.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
1647
git-ls-remote.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
1732
git-merge-octopus.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
1934
git-merge-one-file.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
14190
git-merge-recursive.py
blob
|
blame
|
history
|
raw
-rwxr-xr-x
864
git-merge-resolve.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
1458
git-merge-stupid.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
4598
git-merge.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
2246
git-octopus.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
3591
git-parse-remote.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
500
git-prune.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
1148
git-pull.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
967
git-push.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
1502
git-rebase.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
4111
git-relink.perl
blob
|
blame
|
history
|
raw
-rwxr-xr-x
1609
git-rename.perl
blob
|
blame
|
history
|
raw
-rwxr-xr-x
1522
git-repack.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
851
git-request-pull.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
2124
git-reset.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
2370
git-resolve.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
3850
git-revert.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
8637
git-send-email.perl
blob
|
blame
|
history
|
raw
-rwxr-xr-x
795
git-sh-setup.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
3908
git-shortlog.perl
blob
|
blame
|
history
|
raw
-rwxr-xr-x
1520
git-status.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
1553
git-tag.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
225
git-verify-tag.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
264
git-whatchanged.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
815
git.sh
blob
|
blame
|
history
|
raw
-rw-r--r--
6867
gitMergeCommon.py
blob
|
blame
|
history
|
raw
-rwxr-xr-x
98224
gitk
blob
|
blame
|
history
|
raw
-rw-r--r--
973
hash-object.c
blob
|
blame
|
history
|
raw
-rw-r--r--
11953
http-fetch.c
blob
|
blame
|
history
|
raw
-rw-r--r--
4088
ident.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1088
index.c
blob
|
blame
|
history
|
raw
-rw-r--r--
6104
init-db.c
blob
|
blame
|
history
|
raw
-rw-r--r--
5950
local-fetch.c
blob
|
blame
|
history
|
raw
-rw-r--r--
14900
ls-files.c
blob
|
blame
|
history
|
raw
-rw-r--r--
5770
ls-tree.c
blob
|
blame
|
history
|
raw
-rw-r--r--
15211
mailinfo.c
blob
|
blame
|
history
|
raw
-rw-r--r--
2537
mailsplit.c
blob
|
blame
|
history
|
raw
-rw-r--r--
4080
merge-base.c
blob
|
blame
|
history
|
raw
-rw-r--r--
2633
merge-index.c
blob
|
blame
|
history
|
raw
-rw-r--r--
3227
mktag.c
blob
|
blame
|
history
|
raw
drwxr-xr-x
-
mozilla-sha1
tree
|
history
-rw-r--r--
4943
object.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1395
object.h
blob
|
blame
|
history
|
raw
-rw-r--r--
3796
pack-check.c
blob
|
blame
|
history
|
raw
-rw-r--r--
11685
pack-objects.c
blob
|
blame
|
history
|
raw
-rw-r--r--
618
pack.h
blob
|
blame
|
history
|
raw
-rw-r--r--
1755
patch-delta.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1475
patch-id.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1848
path.c
blob
|
blame
|
history
|
raw
-rw-r--r--
970
peek-remote.c
blob
|
blame
|
history
|
raw
-rw-r--r--
2567
pkt-line.c
blob
|
blame
|
history
|
raw
-rw-r--r--
270
pkt-line.h
blob
|
blame
|
history
|
raw
drwxr-xr-x
-
ppc
tree
|
history
-rw-r--r--
1478
prune-packed.c
blob
|
blame
|
history
|
raw
-rw-r--r--
825
quote.c
blob
|
blame
|
history
|
raw
-rw-r--r--
752
quote.h
blob
|
blame
|
history
|
raw
-rw-r--r--
14009
read-cache.c
blob
|
blame
|
history
|
raw
-rw-r--r--
15301
read-tree.c
blob
|
blame
|
history
|
raw
-rw-r--r--
6439
receive-pack.c
blob
|
blame
|
history
|
raw
-rw-r--r--
5606
refs.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1036
refs.h
blob
|
blame
|
history
|
raw
-rw-r--r--
14111
rev-list.c
blob
|
blame
|
history
|
raw
-rw-r--r--
5672
rev-parse.c
blob
|
blame
|
history
|
raw
-rw-r--r--
2804
rsh.c
blob
|
blame
|
history
|
raw
-rw-r--r--
159
rsh.h
blob
|
blame
|
history
|
raw
-rw-r--r--
1200
run-command.c
blob
|
blame
|
history
|
raw
-rw-r--r--
360
run-command.h
blob
|
blame
|
history
|
raw
-rw-r--r--
7150
send-pack.c
blob
|
blame
|
history
|
raw
-rw-r--r--
11769
server-info.c
blob
|
blame
|
history
|
raw
-rw-r--r--
2423
setup.c
blob
|
blame
|
history
|
raw
-rw-r--r--
34785
sha1_file.c
blob
|
blame
|
history
|
raw
-rw-r--r--
5470
sha1_name.c
blob
|
blame
|
history
|
raw
-rw-r--r--
11789
show-branch.c
blob
|
blame
|
history
|
raw
-rw-r--r--
593
show-index.c
blob
|
blame
|
history
|
raw
-rw-r--r--
2833
ssh-fetch.c
blob
|
blame
|
history
|
raw
-rw-r--r--
154
ssh-pull.c
blob
|
blame
|
history
|
raw
-rw-r--r--
155
ssh-push.c
blob
|
blame
|
history
|
raw
-rw-r--r--
2838
ssh-upload.c
blob
|
blame
|
history
|
raw
-rw-r--r--
807
strbuf.c
blob
|
blame
|
history
|
raw
-rw-r--r--
216
strbuf.h
blob
|
blame
|
history
|
raw
-rw-r--r--
786
stripspace.c
blob
|
blame
|
history
|
raw
drwxr-xr-x
-
t
tree
|
history
-rw-r--r--
2397
tag.c
blob
|
blame
|
history
|
raw
-rw-r--r--
452
tag.h
blob
|
blame
|
history
|
raw
-rw-r--r--
10955
tar-tree.c
blob
|
blame
|
history
|
raw
drwxr-xr-x
-
templates
tree
|
history
-rw-r--r--
343
test-date.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1878
test-delta.c
blob
|
blame
|
history
|
raw
-rw-r--r--
5607
tree.c
blob
|
blame
|
history
|
raw
-rw-r--r--
790
tree.h
blob
|
blame
|
history
|
raw
-rw-r--r--
684
unpack-file.c
blob
|
blame
|
history
|
raw
-rw-r--r--
6888
unpack-objects.c
blob
|
blame
|
history
|
raw
-rw-r--r--
8784
update-index.c
blob
|
blame
|
history
|
raw
-rw-r--r--
432
update-server-info.c
blob
|
blame
|
history
|
raw
-rw-r--r--
3953
upload-pack.c
blob
|
blame
|
history
|
raw
-rw-r--r--
625
usage.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1101
var.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1141
verify-pack.c
blob
|
blame
|
history
|
raw
-rw-r--r--
3850
write-tree.c
blob
|
blame
|
history
|
raw