repo.or.cz
/
git
/
jrn.git
/
tree
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
snapshot (
tar.gz
zip
)
read-tree: move merge functions to the library
tree
99b9d07f74b648b5353a56350247b929efa7acde
-rw-r--r--
1970
.gitignore
blob
|
blame
|
history
|
raw
-rw-r--r--
18787
COPYING
blob
|
blame
|
history
|
raw
drwxr-xr-x
-
Documentation
tree
|
history
-rwxr-xr-x
665
GIT-VERSION-GEN
blob
|
blame
|
history
|
raw
-rw-r--r--
4794
INSTALL
blob
|
blame
|
history
|
raw
-rw-r--r--
24036
Makefile
blob
|
blame
|
history
|
raw
-rw-r--r--
25245
README
blob
|
blame
|
history
|
raw
-rw-r--r--
1264
alloc.c
blob
|
blame
|
history
|
raw
drwxr-xr-x
-
arm
tree
|
history
-rw-r--r--
2932
base85.c
blob
|
blame
|
history
|
raw
-rw-r--r--
20866
blame.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1260
blob.c
blob
|
blame
|
history
|
raw
-rw-r--r--
311
blob.h
blob
|
blame
|
history
|
raw
-rw-r--r--
3114
builtin-add.c
blob
|
blame
|
history
|
raw
-rw-r--r--
58977
builtin-apply.c
blob
|
blame
|
history
|
raw
-rw-r--r--
3596
builtin-cat-file.c
blob
|
blame
|
history
|
raw
-rw-r--r--
282
builtin-check-ref-format.c
blob
|
blame
|
history
|
raw
-rw-r--r--
3371
builtin-commit-tree.c
blob
|
blame
|
history
|
raw
-rw-r--r--
2846
builtin-count.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1579
builtin-diff-files.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1037
builtin-diff-index.c
blob
|
blame
|
history
|
raw
-rw-r--r--
2607
builtin-diff-stages.c
blob
|
blame
|
history
|
raw
-rw-r--r--
3253
builtin-diff-tree.c
blob
|
blame
|
history
|
raw
-rw-r--r--
9060
builtin-diff.c
blob
|
blame
|
history
|
raw
-rw-r--r--
7938
builtin-fmt-merge-msg.c
blob
|
blame
|
history
|
raw
-rw-r--r--
26636
builtin-grep.c
blob
|
blame
|
history
|
raw
-rw-r--r--
5091
builtin-help.c
blob
|
blame
|
history
|
raw
-rw-r--r--
8330
builtin-init-db.c
blob
|
blame
|
history
|
raw
-rw-r--r--
11341
builtin-log.c
blob
|
blame
|
history
|
raw
-rw-r--r--
11687
builtin-ls-files.c
blob
|
blame
|
history
|
raw
-rw-r--r--
3552
builtin-ls-tree.c
blob
|
blame
|
history
|
raw
-rw-r--r--
17920
builtin-mailinfo.c
blob
|
blame
|
history
|
raw
-rw-r--r--
4329
builtin-mailsplit.c
blob
|
blame
|
history
|
raw
-rw-r--r--
7257
builtin-mv.c
blob
|
blame
|
history
|
raw
-rw-r--r--
5671
builtin-prune.c
blob
|
blame
|
history
|
raw
-rw-r--r--
6488
builtin-push.c
blob
|
blame
|
history
|
raw
-rw-r--r--
6079
builtin-read-tree.c
blob
|
blame
|
history
|
raw
-rw-r--r--
8538
builtin-rev-list.c
blob
|
blame
|
history
|
raw
-rw-r--r--
7836
builtin-rev-parse.c
blob
|
blame
|
history
|
raw
-rw-r--r--
3228
builtin-rm.c
blob
|
blame
|
history
|
raw
-rw-r--r--
18612
builtin-show-branch.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1070
builtin-stripspace.c
blob
|
blame
|
history
|
raw
-rw-r--r--
10853
builtin-tar-tree.c
blob
|
blame
|
history
|
raw
-rw-r--r--
16925
builtin-update-index.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1369
builtin-update-ref.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1633
builtin-upload-tar.c
blob
|
blame
|
history
|
raw
-rw-r--r--
2158
builtin-write-tree.c
blob
|
blame
|
history
|
raw
-rw-r--r--
3551
builtin.h
blob
|
blame
|
history
|
raw
-rw-r--r--
12793
cache-tree.c
blob
|
blame
|
history
|
raw
-rw-r--r--
921
cache-tree.h
blob
|
blame
|
history
|
raw
-rw-r--r--
14324
cache.h
blob
|
blame
|
history
|
raw
-rw-r--r--
7666
checkout-index.c
blob
|
blame
|
history
|
raw
-rw-r--r--
23905
combine-diff.c
blob
|
blame
|
history
|
raw
-rw-r--r--
23015
commit.c
blob
|
blame
|
history
|
raw
-rw-r--r--
3220
commit.h
blob
|
blame
|
history
|
raw
drwxr-xr-x
-
compat
tree
|
history
-rw-r--r--
15876
config.c
blob
|
blame
|
history
|
raw
-rw-r--r--
494
config.mak.in
blob
|
blame
|
history
|
raw
-rw-r--r--
6527
configure.ac
blob
|
blame
|
history
|
raw
-rw-r--r--
15980
connect.c
blob
|
blame
|
history
|
raw
drwxr-xr-x
-
contrib
tree
|
history
-rw-r--r--
7581
convert-objects.c
blob
|
blame
|
history
|
raw
-rw-r--r--
692
copy.c
blob
|
blame
|
history
|
raw
-rw-r--r--
2954
csum-file.c
blob
|
blame
|
history
|
raw
-rw-r--r--
566
csum-file.h
blob
|
blame
|
history
|
raw
-rw-r--r--
890
ctype.c
blob
|
blame
|
history
|
raw
-rw-r--r--
18219
daemon.c
blob
|
blame
|
history
|
raw
-rw-r--r--
15320
date.c
blob
|
blame
|
history
|
raw
-rw-r--r--
3273
delta.h
blob
|
blame
|
history
|
raw
-rw-r--r--
3760
describe.c
blob
|
blame
|
history
|
raw
-rw-r--r--
14168
diff-delta.c
blob
|
blame
|
history
|
raw
-rw-r--r--
8114
diff-lib.c
blob
|
blame
|
history
|
raw
-rw-r--r--
62909
diff.c
blob
|
blame
|
history
|
raw
-rw-r--r--
6196
diff.h
blob
|
blame
|
history
|
raw
-rw-r--r--
8689
diffcore-break.c
blob
|
blame
|
history
|
raw
-rw-r--r--
5269
diffcore-delta.c
blob
|
blame
|
history
|
raw
-rw-r--r--
2295
diffcore-order.c
blob
|
blame
|
history
|
raw
-rw-r--r--
3321
diffcore-pickaxe.c
blob
|
blame
|
history
|
raw
-rw-r--r--
13056
diffcore-rename.c
blob
|
blame
|
history
|
raw
-rw-r--r--
3768
diffcore.h
blob
|
blame
|
history
|
raw
-rw-r--r--
9055
dir.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1287
dir.h
blob
|
blame
|
history
|
raw
-rw-r--r--
1529
dump-cache-tree.c
blob
|
blame
|
history
|
raw
-rw-r--r--
4238
entry.c
blob
|
blame
|
history
|
raw
-rw-r--r--
2068
environment.c
blob
|
blame
|
history
|
raw
-rw-r--r--
3071
exec_cmd.c
blob
|
blame
|
history
|
raw
-rw-r--r--
295
exec_cmd.h
blob
|
blame
|
history
|
raw
-rw-r--r--
6935
fetch-clone.c
blob
|
blame
|
history
|
raw
-rw-r--r--
12041
fetch-pack.c
blob
|
blame
|
history
|
raw
-rw-r--r--
6701
fetch.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1639
fetch.h
blob
|
blame
|
history
|
raw
-rw-r--r--
13606
fsck-objects.c
blob
|
blame
|
history
|
raw
-rwxr-xr-x
550
generate-cmdlist.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
10344
git-am.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
12612
git-annotate.perl
blob
|
blame
|
history
|
raw
-rwxr-xr-x
2868
git-applymbox.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
5520
git-applypatch.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
35068
git-archimport.perl
blob
|
blame
|
history
|
raw
-rwxr-xr-x
5851
git-bisect.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
2671
git-branch.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
4992
git-checkout.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
1986
git-cherry.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
1542
git-clean.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
10076
git-clone.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
16505
git-commit.sh
blob
|
blame
|
history
|
raw
-rw-r--r--
3807
git-compat-util.h
blob
|
blame
|
history
|
raw
-rwxr-xr-x
8358
git-cvsexportcommit.perl
blob
|
blame
|
history
|
raw
-rwxr-xr-x
23964
git-cvsimport.perl
blob
|
blame
|
history
|
raw
-rwxr-xr-x
91527
git-cvsserver.perl
blob
|
blame
|
history
|
raw
-rwxr-xr-x
10580
git-fetch.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
4988
git-instaweb.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
468
git-lost-found.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
2093
git-ls-remote.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
2415
git-merge-octopus.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
2801
git-merge-one-file.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
356
git-merge-ours.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
31524
git-merge-recursive.py
blob
|
blame
|
history
|
raw
-rwxr-xr-x
955
git-merge-resolve.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
1458
git-merge-stupid.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
8078
git-merge.sh
blob
|
blame
|
history
|
raw
-rw-r--r--
10732
git-p4import.py
blob
|
blame
|
history
|
raw
-rwxr-xr-x
4867
git-parse-remote.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
2702
git-pull.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
1734
git-push.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
3028
git-quiltimport.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
7990
git-rebase.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
4111
git-relink.perl
blob
|
blame
|
history
|
raw
-rwxr-xr-x
2313
git-repack.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
844
git-request-pull.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
4950
git-rerere.perl
blob
|
blame
|
history
|
raw
-rwxr-xr-x
1531
git-reset.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
2523
git-resolve.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
4115
git-revert.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
15347
git-send-email.perl
blob
|
blame
|
history
|
raw
-rwxr-xr-x
1057
git-sh-setup.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
4046
git-shortlog.perl
blob
|
blame
|
history
|
raw
-rwxr-xr-x
88832
git-svn.perl
blob
|
blame
|
history
|
raw
-rwxr-xr-x
23318
git-svnimport.perl
blob
|
blame
|
history
|
raw
-rwxr-xr-x
2292
git-tag.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
703
git-verify-tag.sh
blob
|
blame
|
history
|
raw
-rw-r--r--
9035
git.c
blob
|
blame
|
history
|
raw
-rw-r--r--
6408
git.spec.in
blob
|
blame
|
history
|
raw
-rw-r--r--
7031
gitMergeCommon.py
blob
|
blame
|
history
|
raw
-rwxr-xr-x
157739
gitk
blob
|
blame
|
history
|
raw
drwxr-xr-x
-
gitweb
tree
|
history
-rw-r--r--
1889
hash-object.c
blob
|
blame
|
history
|
raw
-rw-r--r--
32218
http-fetch.c
blob
|
blame
|
history
|
raw
-rw-r--r--
68561
http-push.c
blob
|
blame
|
history
|
raw
-rw-r--r--
11336
http.c
blob
|
blame
|
history
|
raw
-rw-r--r--
2393
http.h
blob
|
blame
|
history
|
raw
-rw-r--r--
5256
ident.c
blob
|
blame
|
history
|
raw
-rw-r--r--
29660
imap-send.c
blob
|
blame
|
history
|
raw
-rw-r--r--
11928
index-pack.c
blob
|
blame
|
history
|
raw
-rw-r--r--
6284
local-fetch.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1286
lockfile.c
blob
|
blame
|
history
|
raw
-rw-r--r--
7870
log-tree.c
blob
|
blame
|
history
|
raw
-rw-r--r--
386
log-tree.h
blob
|
blame
|
history
|
raw
-rw-r--r--
1184
merge-base.c
blob
|
blame
|
history
|
raw
-rw-r--r--
3340
merge-file.c
blob
|
blame
|
history
|
raw
-rw-r--r--
2798
merge-index.c
blob
|
blame
|
history
|
raw
-rw-r--r--
7988
merge-tree.c
blob
|
blame
|
history
|
raw
-rw-r--r--
3824
mktag.c
blob
|
blame
|
history
|
raw
-rw-r--r--
3160
mktree.c
blob
|
blame
|
history
|
raw
drwxr-xr-x
-
mozilla-sha1
tree
|
history
-rw-r--r--
5502
name-rev.c
blob
|
blame
|
history
|
raw
-rw-r--r--
3098
object-refs.c
blob
|
blame
|
history
|
raw
-rw-r--r--
5239
object.c
blob
|
blame
|
history
|
raw
-rw-r--r--
2312
object.h
blob
|
blame
|
history
|
raw
-rw-r--r--
4293
pack-check.c
blob
|
blame
|
history
|
raw
-rw-r--r--
34341
pack-objects.c
blob
|
blame
|
history
|
raw
-rw-r--r--
14614
pack-redundant.c
blob
|
blame
|
history
|
raw
-rw-r--r--
519
pack.h
blob
|
blame
|
history
|
raw
-rw-r--r--
929
pager.c
blob
|
blame
|
history
|
raw
-rw-r--r--
2172
patch-delta.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1592
patch-id.c
blob
|
blame
|
history
|
raw
-rw-r--r--
2341
path-list.c
blob
|
blame
|
history
|
raw
-rw-r--r--
603
path-list.h
blob
|
blame
|
history
|
raw
-rw-r--r--
5958
path.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1306
peek-remote.c
blob
|
blame
|
history
|
raw
-rw-r--r--
2500
pkt-line.c
blob
|
blame
|
history
|
raw
-rw-r--r--
348
pkt-line.h
blob
|
blame
|
history
|
raw
drwxr-xr-x
-
ppc
tree
|
history
-rw-r--r--
1524
prune-packed.c
blob
|
blame
|
history
|
raw
-rw-r--r--
6050
quote.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1622
quote.h
blob
|
blame
|
history
|
raw
-rw-r--r--
24624
read-cache.c
blob
|
blame
|
history
|
raw
-rw-r--r--
7801
receive-pack.c
blob
|
blame
|
history
|
raw
-rw-r--r--
12752
refs.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1669
refs.h
blob
|
blame
|
history
|
raw
-rw-r--r--
4783
repo-config.c
blob
|
blame
|
history
|
raw
-rw-r--r--
26804
revision.c
blob
|
blame
|
history
|
raw
-rw-r--r--
2666
revision.h
blob
|
blame
|
history
|
raw
-rw-r--r--
2335
rsh.c
blob
|
blame
|
history
|
raw
-rw-r--r--
159
rsh.h
blob
|
blame
|
history
|
raw
-rw-r--r--
1546
run-command.c
blob
|
blame
|
history
|
raw
-rw-r--r--
523
run-command.h
blob
|
blame
|
history
|
raw
-rw-r--r--
9396
send-pack.c
blob
|
blame
|
history
|
raw
-rw-r--r--
5186
server-info.c
blob
|
blame
|
history
|
raw
-rw-r--r--
6281
setup.c
blob
|
blame
|
history
|
raw
-rw-r--r--
42806
sha1_file.c
blob
|
blame
|
history
|
raw
-rw-r--r--
12345
sha1_name.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1171
shell.c
blob
|
blame
|
history
|
raw
-rw-r--r--
593
show-index.c
blob
|
blame
|
history
|
raw
-rw-r--r--
3675
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--
2887
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--
785
symbolic-ref.c
blob
|
blame
|
history
|
raw
drwxr-xr-x
-
t
tree
|
history
-rw-r--r--
2624
tag.c
blob
|
blame
|
history
|
raw
-rw-r--r--
471
tag.h
blob
|
blame
|
history
|
raw
-rw-r--r--
644
tar.h
blob
|
blame
|
history
|
raw
drwxr-xr-x
-
templates
tree
|
history
-rw-r--r--
416
test-date.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1878
test-delta.c
blob
|
blame
|
history
|
raw
-rw-r--r--
815
test-sha1.c
blob
|
blame
|
history
|
raw
-rwxr-xr-x
1895
test-sha1.sh
blob
|
blame
|
history
|
raw
-rw-r--r--
5839
tree-diff.c
blob
|
blame
|
history
|
raw
-rw-r--r--
4402
tree-walk.c
blob
|
blame
|
history
|
raw
-rw-r--r--
863
tree-walk.h
blob
|
blame
|
history
|
raw
-rw-r--r--
5108
tree.c
blob
|
blame
|
history
|
raw
-rw-r--r--
860
tree.h
blob
|
blame
|
history
|
raw
-rw-r--r--
812
unpack-file.c
blob
|
blame
|
history
|
raw
-rw-r--r--
6685
unpack-objects.c
blob
|
blame
|
history
|
raw
-rw-r--r--
18399
unpack-trees.c
blob
|
blame
|
history
|
raw
-rw-r--r--
865
unpack-trees.h
blob
|
blame
|
history
|
raw
-rw-r--r--
457
update-server-info.c
blob
|
blame
|
history
|
raw
-rw-r--r--
11599
upload-pack.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1567
usage.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1371
var.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1147
verify-pack.c
blob
|
blame
|
history
|
raw
-rw-r--r--
2230
xdiff-interface.c
blob
|
blame
|
history
|
raw
-rw-r--r--
446
xdiff-interface.h
blob
|
blame
|
history
|
raw
drwxr-xr-x
-
xdiff
tree
|
history