Andrew's git
/
gitweb.git
/ tree
summary
|
log
|
commit
|
diff
| tree
commit
grep
author
committer
pickaxe
?
re
Try to find the optimum merge base while resolving.
-rw-r--r--
18787
COPYING
blob
|
history
|
raw
drwxr-xr-x
-
Documentation
tree
|
history
-rw-r--r--
2779
INSTALL
blob
|
history
|
raw
-rw-r--r--
7074
Makefile
blob
|
history
|
raw
-rw-r--r--
21484
README
blob
|
history
|
raw
-rw-r--r--
34875
apply.c
blob
|
history
|
raw
-rw-r--r--
1304
blob.c
blob
|
history
|
raw
-rw-r--r--
311
blob.h
blob
|
history
|
raw
-rw-r--r--
1087
build-rev-cache.c
blob
|
history
|
raw
-rw-r--r--
11214
cache.h
blob
|
history
|
raw
-rw-r--r--
1068
cat-file.c
blob
|
history
|
raw
-rw-r--r--
3678
checkout-cache.c
blob
|
history
|
raw
-rw-r--r--
4107
clone-pack.c
blob
|
history
|
raw
-rw-r--r--
3147
commit-tree.c
blob
|
history
|
raw
-rw-r--r--
13813
commit.c
blob
|
history
|
raw
-rw-r--r--
1951
commit.h
blob
|
history
|
raw
-rw-r--r--
9113
connect.c
blob
|
history
|
raw
-rw-r--r--
7232
convert-cache.c
blob
|
history
|
raw
-rw-r--r--
2261
count-delta.c
blob
|
history
|
raw
-rw-r--r--
196
count-delta.h
blob
|
history
|
raw
-rw-r--r--
2978
csum-file.c
blob
|
history
|
raw
-rw-r--r--
566
csum-file.h
blob
|
history
|
raw
-rw-r--r--
7696
daemon.c
blob
|
history
|
raw
-rw-r--r--
10417
date.c
blob
|
history
|
raw
drwxr-xr-x
-
debian
tree
|
history
-rw-r--r--
919
delta.h
blob
|
history
|
raw
-rw-r--r--
6974
diff-cache.c
blob
|
history
|
raw
-rw-r--r--
7308
diff-delta.c
blob
|
history
|
raw
-rw-r--r--
4177
diff-files.c
blob
|
history
|
raw
-rw-r--r--
3464
diff-helper.c
blob
|
history
|
raw
-rw-r--r--
3539
diff-stages.c
blob
|
history
|
raw
-rw-r--r--
13310
diff-tree.c
blob
|
history
|
raw
-rw-r--r--
29843
diff.c
blob
|
history
|
raw
-rw-r--r--
2983
diff.h
blob
|
history
|
raw
-rw-r--r--
8547
diffcore-break.c
blob
|
history
|
raw
-rw-r--r--
2258
diffcore-order.c
blob
|
history
|
raw
-rw-r--r--
1218
diffcore-pathspec.c
blob
|
history
|
raw
-rw-r--r--
2541
diffcore-pickaxe.c
blob
|
history
|
raw
-rw-r--r--
11623
diffcore-rename.c
blob
|
history
|
raw
-rw-r--r--
3476
diffcore.h
blob
|
history
|
raw
-rw-r--r--
3715
entry.c
blob
|
history
|
raw
-rw-r--r--
17342
epoch.c
blob
|
history
|
raw
-rw-r--r--
476
epoch.h
blob
|
history
|
raw
-rw-r--r--
1805
export.c
blob
|
history
|
raw
-rw-r--r--
3738
fetch-pack.c
blob
|
history
|
raw
-rw-r--r--
11989
fsck-cache.c
blob
|
history
|
raw
-rw-r--r--
472
get-tar-commit-id.c
blob
|
history
|
raw
-rwxr-xr-x
493
git
blob
|
history
|
raw
-rwxr-xr-x
41
git-add-script
blob
|
history
|
raw
-rwxr-xr-x
3345
git-apply-patch-script
blob
|
history
|
raw
-rwxr-xr-x
3583
git-bisect-script
blob
|
history
|
raw
-rwxr-xr-x
582
git-branch-script
blob
|
history
|
raw
-rwxr-xr-x
1622
git-checkout-script
blob
|
history
|
raw
-rwxr-xr-x
2089
git-cherry
blob
|
history
|
raw
-rwxr-xr-x
1256
git-clone-dumb-http
blob
|
history
|
raw
-rwxr-xr-x
2707
git-clone-script
blob
|
history
|
raw
-rwxr-xr-x
5498
git-commit-script
blob
|
history
|
raw
-rw-r--r--
1860
git-core.spec.in
blob
|
history
|
raw
-rwxr-xr-x
353
git-count-objects-script
blob
|
history
|
raw
-rwxr-xr-x
20159
git-cvsimport-script
blob
|
history
|
raw
-rwxr-xr-x
701
git-diff-script
blob
|
history
|
raw
-rwxr-xr-x
1490
git-external-diff-script
blob
|
history
|
raw
-rwxr-xr-x
1404
git-fetch-script
blob
|
history
|
raw
-rwxr-xr-x
4975
git-format-patch-script
blob
|
history
|
raw
-rwxr-xr-x
189
git-log-script
blob
|
history
|
raw
-rwxr-xr-x
1507
git-ls-remote-script
blob
|
history
|
raw
-rwxr-xr-x
1910
git-merge-one-file-script
blob
|
history
|
raw
-rwxr-xr-x
1765
git-parse-remote
blob
|
history
|
raw
-rwxr-xr-x
512
git-prune-script
blob
|
history
|
raw
-rwxr-xr-x
250
git-pull-script
blob
|
history
|
raw
-rwxr-xr-x
1310
git-push-script
blob
|
history
|
raw
-rwxr-xr-x
1374
git-rebase-script
blob
|
history
|
raw
-rwxr-xr-x
4111
git-relink-script
blob
|
history
|
raw
-rwxr-xr-x
1609
git-rename-script
blob
|
history
|
raw
-rwxr-xr-x
477
git-repack-script
blob
|
history
|
raw
-rwxr-xr-x
847
git-request-pull-script
blob
|
history
|
raw
-rwxr-xr-x
2068
git-reset-script
blob
|
history
|
raw
-rwxr-xr-x
2416
git-resolve-script
blob
|
history
|
raw
-rwxr-xr-x
1175
git-revert-script
blob
|
history
|
raw
-rwxr-xr-x
6868
git-send-email-script
blob
|
history
|
raw
-rwxr-xr-x
310
git-sh-setup-script
blob
|
history
|
raw
-rwxr-xr-x
3904
git-shortlog
blob
|
history
|
raw
-rwxr-xr-x
1035
git-status-script
blob
|
history
|
raw
-rwxr-xr-x
1567
git-tag-script
blob
|
history
|
raw
-rwxr-xr-x
232
git-verify-tag-script
blob
|
history
|
raw
-rwxr-xr-x
264
git-whatchanged
blob
|
history
|
raw
-rw-r--r--
1830
gitenv.c
blob
|
history
|
raw
-rwxr-xr-x
95791
gitk
blob
|
history
|
raw
-rw-r--r--
973
hash-object.c
blob
|
history
|
raw
-rw-r--r--
7928
http-pull.c
blob
|
history
|
raw
-rw-r--r--
3252
ident.c
blob
|
history
|
raw
-rw-r--r--
1088
index.c
blob
|
history
|
raw
-rw-r--r--
6088
init-db.c
blob
|
history
|
raw
-rw-r--r--
5464
local-pull.c
blob
|
history
|
raw
-rw-r--r--
14546
ls-files.c
blob
|
history
|
raw
-rw-r--r--
5770
ls-tree.c
blob
|
history
|
raw
-rw-r--r--
4080
merge-base.c
blob
|
history
|
raw
-rw-r--r--
2633
merge-cache.c
blob
|
history
|
raw
-rw-r--r--
3227
mktag.c
blob
|
history
|
raw
drwxr-xr-x
-
mozilla-sha1
tree
|
history
-rw-r--r--
4576
object.c
blob
|
history
|
raw
-rw-r--r--
1286
object.h
blob
|
history
|
raw
-rw-r--r--
3796
pack-check.c
blob
|
history
|
raw
-rw-r--r--
11685
pack-objects.c
blob
|
history
|
raw
-rw-r--r--
618
pack.h
blob
|
history
|
raw
-rw-r--r--
1731
patch-delta.c
blob
|
history
|
raw
-rw-r--r--
1475
patch-id.c
blob
|
history
|
raw
-rw-r--r--
1816
path.c
blob
|
history
|
raw
-rw-r--r--
970
peek-remote.c
blob
|
history
|
raw
-rw-r--r--
2567
pkt-line.c
blob
|
history
|
raw
-rw-r--r--
270
pkt-line.h
blob
|
history
|
raw
drwxr-xr-x
-
ppc
tree
|
history
-rw-r--r--
1478
prune-packed.c
blob
|
history
|
raw
-rw-r--r--
4365
pull.c
blob
|
history
|
raw
-rw-r--r--
1318
pull.h
blob
|
history
|
raw
-rw-r--r--
825
quote.c
blob
|
history
|
raw
-rw-r--r--
752
quote.h
blob
|
history
|
raw
-rw-r--r--
12163
read-cache.c
blob
|
history
|
raw
-rw-r--r--
16049
read-tree.c
blob
|
history
|
raw
-rw-r--r--
6445
receive-pack.c
blob
|
history
|
raw
-rw-r--r--
5606
refs.c
blob
|
history
|
raw
-rw-r--r--
1036
refs.h
blob
|
history
|
raw
-rw-r--r--
7213
rev-cache.c
blob
|
history
|
raw
-rw-r--r--
740
rev-cache.h
blob
|
history
|
raw
-rw-r--r--
14040
rev-list.c
blob
|
history
|
raw
-rw-r--r--
4207
rev-parse.c
blob
|
history
|
raw
-rw-r--r--
3134
rev-tree.c
blob
|
history
|
raw
-rw-r--r--
1551
rsh.c
blob
|
history
|
raw
-rw-r--r--
159
rsh.h
blob
|
history
|
raw
-rw-r--r--
1200
run-command.c
blob
|
history
|
raw
-rw-r--r--
360
run-command.h
blob
|
history
|
raw
-rw-r--r--
7052
send-pack.c
blob
|
history
|
raw
-rw-r--r--
13319
server-info.c
blob
|
history
|
raw
-rw-r--r--
2197
setup.c
blob
|
history
|
raw
-rw-r--r--
34281
sha1_file.c
blob
|
history
|
raw
-rw-r--r--
5475
sha1_name.c
blob
|
history
|
raw
-rw-r--r--
8403
show-branch.c
blob
|
history
|
raw
-rw-r--r--
593
show-index.c
blob
|
history
|
raw
-rw-r--r--
324
show-rev-cache.c
blob
|
history
|
raw
-rw-r--r--
2499
ssh-pull.c
blob
|
history
|
raw
-rw-r--r--
2547
ssh-push.c
blob
|
history
|
raw
-rw-r--r--
807
strbuf.c
blob
|
history
|
raw
-rw-r--r--
216
strbuf.h
blob
|
history
|
raw
-rw-r--r--
786
stripspace.c
blob
|
history
|
raw
drwxr-xr-x
-
t
tree
|
history
-rw-r--r--
2397
tag.c
blob
|
history
|
raw
-rw-r--r--
452
tag.h
blob
|
history
|
raw
-rw-r--r--
10955
tar-tree.c
blob
|
history
|
raw
drwxr-xr-x
-
templates
tree
|
history
-rw-r--r--
343
test-date.c
blob
|
history
|
raw
-rw-r--r--
1878
test-delta.c
blob
|
history
|
raw
drwxr-xr-x
-
tools
tree
|
history
-rw-r--r--
5122
tree.c
blob
|
history
|
raw
-rw-r--r--
650
tree.h
blob
|
history
|
raw
-rw-r--r--
684
unpack-file.c
blob
|
history
|
raw
-rw-r--r--
6888
unpack-objects.c
blob
|
history
|
raw
-rw-r--r--
9282
update-cache.c
blob
|
history
|
raw
-rw-r--r--
432
update-server-info.c
blob
|
history
|
raw
-rw-r--r--
3959
upload-pack.c
blob
|
history
|
raw
-rw-r--r--
625
usage.c
blob
|
history
|
raw
-rw-r--r--
1101
var.c
blob
|
history
|
raw
-rw-r--r--
1141
verify-pack.c
blob
|
history
|
raw
-rw-r--r--
3850
write-tree.c
blob
|
history
|
raw