repo.or.cz
/
git
/
jnareb-git
/
bp-gitweb.git
/
tree
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
snapshot (
tar.gz
zip
)
git-merge-one: new merge world order.
tree
d9e5e8dca5c27f1d311046a558f346c64a7bb343
-rw-r--r--
1658
.gitignore
blob
|
blame
|
history
|
raw
-rw-r--r--
18787
COPYING
blob
|
blame
|
history
|
raw
drwxr-xr-x
-
Documentation
tree
|
history
-rw-r--r--
3884
INSTALL
blob
|
blame
|
history
|
raw
-rw-r--r--
14411
Makefile
blob
|
blame
|
history
|
raw
-rw-r--r--
25097
README
blob
|
blame
|
history
|
raw
-rw-r--r--
44075
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--
12190
cache.h
blob
|
blame
|
history
|
raw
-rw-r--r--
1301
cat-file.c
blob
|
blame
|
history
|
raw
-rw-r--r--
248
check-ref-format.c
blob
|
blame
|
history
|
raw
-rw-r--r--
4997
checkout-index.c
blob
|
blame
|
history
|
raw
-rw-r--r--
6726
clone-pack.c
blob
|
blame
|
history
|
raw
-rwxr-xr-x
1720
cmd-rename.sh
blob
|
blame
|
history
|
raw
-rw-r--r--
3151
commit-tree.c
blob
|
blame
|
history
|
raw
-rw-r--r--
14628
commit.c
blob
|
blame
|
history
|
raw
-rw-r--r--
2000
commit.h
blob
|
blame
|
history
|
raw
drwxr-xr-x
-
compat
tree
|
history
-rw-r--r--
12383
config.c
blob
|
blame
|
history
|
raw
-rw-r--r--
14216
connect.c
blob
|
blame
|
history
|
raw
-rw-r--r--
7315
convert-objects.c
blob
|
blame
|
history
|
raw
-rw-r--r--
750
copy.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--
890
ctype.c
blob
|
blame
|
history
|
raw
-rw-r--r--
14583
daemon.c
blob
|
blame
|
history
|
raw
-rw-r--r--
13795
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--
3798
diff-files.c
blob
|
blame
|
history
|
raw
-rw-r--r--
5594
diff-index.c
blob
|
blame
|
history
|
raw
-rw-r--r--
2334
diff-stages.c
blob
|
blame
|
history
|
raw
-rw-r--r--
5927
diff-tree.c
blob
|
blame
|
history
|
raw
-rw-r--r--
34540
diff.c
blob
|
blame
|
history
|
raw
-rw-r--r--
4113
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--
12970
diffcore-rename.c
blob
|
blame
|
history
|
raw
-rw-r--r--
3482
diffcore.h
blob
|
blame
|
history
|
raw
-rw-r--r--
3716
entry.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1802
environment.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--
10776
fetch-pack.c
blob
|
blame
|
history
|
raw
-rw-r--r--
4790
fetch.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1388
fetch.h
blob
|
blame
|
history
|
raw
-rw-r--r--
12618
fsck-objects.c
blob
|
blame
|
history
|
raw
-rw-r--r--
514
get-tar-commit-id.c
blob
|
blame
|
history
|
raw
-rwxr-xr-x
655
git-add.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
9791
git-am.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
2862
git-applymbox.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
5414
git-applypatch.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
26050
git-archimport.perl
blob
|
blame
|
history
|
raw
-rwxr-xr-x
5478
git-bisect.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
2354
git-branch.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
3263
git-checkout.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
1796
git-cherry.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
5270
git-clone.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
5644
git-commit.sh
blob
|
blame
|
history
|
raw
-rw-r--r--
2582
git-compat-util.h
blob
|
blame
|
history
|
raw
-rwxr-xr-x
706
git-count-objects.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
5506
git-cvsexportcommit.perl
blob
|
blame
|
history
|
raw
-rwxr-xr-x
21370
git-cvsimport.perl
blob
|
blame
|
history
|
raw
-rwxr-xr-x
1322
git-diff.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
7901
git-fetch.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
1824
git-fmt-merge-msg.perl
blob
|
blame
|
history
|
raw
-rwxr-xr-x
6154
git-format-patch.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
738
git-grep.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
351
git-log.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
421
git-lost-found.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
1646
git-ls-remote.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
2192
git-merge-octopus.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
2800
git-merge-one-file.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
356
git-merge-ours.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
29327
git-merge-recursive.py
blob
|
blame
|
history
|
raw
-rwxr-xr-x
942
git-merge-resolve.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
1458
git-merge-stupid.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
6386
git-merge.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
4806
git-mv.perl
blob
|
blame
|
history
|
raw
-rwxr-xr-x
2223
git-octopus.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
4207
git-parse-remote.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
688
git-prune.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
2515
git-pull.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
1172
git-push.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
1378
git-rebase.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
4111
git-relink.perl
blob
|
blame
|
history
|
raw
-rwxr-xr-x
1571
git-repack.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
851
git-request-pull.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
2198
git-reset.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
2357
git-resolve.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
4088
git-revert.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
8637
git-send-email.perl
blob
|
blame
|
history
|
raw
-rwxr-xr-x
706
git-sh-setup.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
4046
git-shortlog.perl
blob
|
blame
|
history
|
raw
-rwxr-xr-x
1923
git-status.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
19511
git-svnimport.perl
blob
|
blame
|
history
|
raw
-rwxr-xr-x
2222
git-tag.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
433
git-verify-tag.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
264
git-whatchanged.sh
blob
|
blame
|
history
|
raw
-rw-r--r--
6198
git.c
blob
|
blame
|
history
|
raw
-rw-r--r--
6444
git.spec.in
blob
|
blame
|
history
|
raw
-rw-r--r--
6922
gitMergeCommon.py
blob
|
blame
|
history
|
raw
-rwxr-xr-x
100322
gitk
blob
|
blame
|
history
|
raw
-rw-r--r--
1561
hash-object.c
blob
|
blame
|
history
|
raw
-rw-r--r--
23684
http-fetch.c
blob
|
blame
|
history
|
raw
-rw-r--r--
37089
http-push.c
blob
|
blame
|
history
|
raw
-rw-r--r--
10222
http.c
blob
|
blame
|
history
|
raw
-rw-r--r--
2213
http.h
blob
|
blame
|
history
|
raw
-rw-r--r--
4480
ident.c
blob
|
blame
|
history
|
raw
-rw-r--r--
11814
index-pack.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1119
index.c
blob
|
blame
|
history
|
raw
-rw-r--r--
7230
init-db.c
blob
|
blame
|
history
|
raw
-rw-r--r--
5847
local-fetch.c
blob
|
blame
|
history
|
raw
-rw-r--r--
15794
ls-files.c
blob
|
blame
|
history
|
raw
-rw-r--r--
2738
ls-tree.c
blob
|
blame
|
history
|
raw
-rw-r--r--
15837
mailinfo.c
blob
|
blame
|
history
|
raw
-rw-r--r--
3131
mailsplit.c
blob
|
blame
|
history
|
raw
-rw-r--r--
6123
merge-base.c
blob
|
blame
|
history
|
raw
-rw-r--r--
2657
merge-index.c
blob
|
blame
|
history
|
raw
-rw-r--r--
3252
mktag.c
blob
|
blame
|
history
|
raw
drwxr-xr-x
-
mozilla-sha1
tree
|
history
-rw-r--r--
5291
name-rev.c
blob
|
blame
|
history
|
raw
-rw-r--r--
5838
object.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1525
object.h
blob
|
blame
|
history
|
raw
-rw-r--r--
3796
pack-check.c
blob
|
blame
|
history
|
raw
-rw-r--r--
13583
pack-objects.c
blob
|
blame
|
history
|
raw
-rw-r--r--
15077
pack-redundant.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--
1541
patch-id.c
blob
|
blame
|
history
|
raw
-rw-r--r--
5457
path.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1029
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--
1524
prune-packed.c
blob
|
blame
|
history
|
raw
-rw-r--r--
5685
quote.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1563
quote.h
blob
|
blame
|
history
|
raw
-rw-r--r--
14093
read-cache.c
blob
|
blame
|
history
|
raw
-rw-r--r--
16004
read-tree.c
blob
|
blame
|
history
|
raw
-rw-r--r--
6269
receive-pack.c
blob
|
blame
|
history
|
raw
-rw-r--r--
8283
refs.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1036
refs.h
blob
|
blame
|
history
|
raw
-rw-r--r--
2640
repo-config.c
blob
|
blame
|
history
|
raw
-rw-r--r--
20226
rev-list.c
blob
|
blame
|
history
|
raw
-rw-r--r--
5606
rev-parse.c
blob
|
blame
|
history
|
raw
-rw-r--r--
2264
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--
7310
send-pack.c
blob
|
blame
|
history
|
raw
-rw-r--r--
5073
server-info.c
blob
|
blame
|
history
|
raw
-rw-r--r--
4410
setup.c
blob
|
blame
|
history
|
raw
-rw-r--r--
36503
sha1_file.c
blob
|
blame
|
history
|
raw
-rw-r--r--
10180
sha1_name.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1100
shell.c
blob
|
blame
|
history
|
raw
-rw-r--r--
15196
show-branch.c
blob
|
blame
|
history
|
raw
-rw-r--r--
593
show-index.c
blob
|
blame
|
history
|
raw
-rw-r--r--
3579
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--
2864
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
-rw-r--r--
785
symbolic-ref.c
blob
|
blame
|
history
|
raw
drwxr-xr-x
-
t
tree
|
history
-rw-r--r--
2664
tag.c
blob
|
blame
|
history
|
raw
-rw-r--r--
471
tag.h
blob
|
blame
|
history
|
raw
-rw-r--r--
11058
tar-tree.c
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--
6260
tree-diff.c
blob
|
blame
|
history
|
raw
-rw-r--r--
5975
tree.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1046
tree.h
blob
|
blame
|
history
|
raw
-rw-r--r--
709
unpack-file.c
blob
|
blame
|
history
|
raw
-rw-r--r--
6918
unpack-objects.c
blob
|
blame
|
history
|
raw
-rw-r--r--
12256
update-index.c
blob
|
blame
|
history
|
raw
-rw-r--r--
2065
update-ref.c
blob
|
blame
|
history
|
raw
-rw-r--r--
457
update-server-info.c
blob
|
blame
|
history
|
raw
-rw-r--r--
6130
upload-pack.c
blob
|
blame
|
history
|
raw
-rw-r--r--
639
usage.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1370
var.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1147
verify-pack.c
blob
|
blame
|
history
|
raw
-rw-r--r--
3946
write-tree.c
blob
|
blame
|
history
|
raw