repo.or.cz
/
git
/
libgit-gsoc.git
/
tree
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
snapshot (
tar.gz
zip
)
fail pull/merge early in the middle of conflicted merge
tree
f70bf896fec309c221cd9b7b5073f5e87d32eab5
-rw-r--r--
2149
.gitignore
blob
|
blame
|
history
|
raw
-rw-r--r--
1442
.mailmap
blob
|
blame
|
history
|
raw
-rw-r--r--
18787
COPYING
blob
|
blame
|
history
|
raw
drwxr-xr-x
-
Documentation
tree
|
history
-rwxr-xr-x
751
GIT-VERSION-GEN
blob
|
blame
|
history
|
raw
-rw-r--r--
4213
INSTALL
blob
|
blame
|
history
|
raw
-rw-r--r--
26826
Makefile
blob
|
blame
|
history
|
raw
-rw-r--r--
25245
README
blob
|
blame
|
history
|
raw
-rw-r--r--
1471
alloc.c
blob
|
blame
|
history
|
raw
-rw-r--r--
8293
archive-tar.c
blob
|
blame
|
history
|
raw
-rw-r--r--
8998
archive-zip.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1109
archive.h
blob
|
blame
|
history
|
raw
drwxr-xr-x
-
arm
tree
|
history
-rw-r--r--
2932
base85.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1240
blob.c
blob
|
blame
|
history
|
raw
-rw-r--r--
311
blob.h
blob
|
blame
|
history
|
raw
-rw-r--r--
4453
builtin-add.c
blob
|
blame
|
history
|
raw
-rw-r--r--
444
builtin-annotate.c
blob
|
blame
|
history
|
raw
-rw-r--r--
67505
builtin-apply.c
blob
|
blame
|
history
|
raw
-rw-r--r--
5911
builtin-archive.c
blob
|
blame
|
history
|
raw
-rw-r--r--
47773
builtin-blame.c
blob
|
blame
|
history
|
raw
-rw-r--r--
11107
builtin-branch.c
blob
|
blame
|
history
|
raw
-rw-r--r--
3286
builtin-cat-file.c
blob
|
blame
|
history
|
raw
-rw-r--r--
282
builtin-check-ref-format.c
blob
|
blame
|
history
|
raw
-rw-r--r--
7799
builtin-checkout-index.c
blob
|
blame
|
history
|
raw
-rw-r--r--
4044
builtin-commit-tree.c
blob
|
blame
|
history
|
raw
-rw-r--r--
2933
builtin-count-objects.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1326
builtin-diff-files.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1037
builtin-diff-index.c
blob
|
blame
|
history
|
raw
-rw-r--r--
2604
builtin-diff-stages.c
blob
|
blame
|
history
|
raw
-rw-r--r--
3253
builtin-diff-tree.c
blob
|
blame
|
history
|
raw
-rw-r--r--
8768
builtin-diff.c
blob
|
blame
|
history
|
raw
-rw-r--r--
7910
builtin-fmt-merge-msg.c
blob
|
blame
|
history
|
raw
-rw-r--r--
20851
builtin-for-each-ref.c
blob
|
blame
|
history
|
raw
-rw-r--r--
16658
builtin-grep.c
blob
|
blame
|
history
|
raw
-rw-r--r--
8900
builtin-init-db.c
blob
|
blame
|
history
|
raw
-rw-r--r--
16337
builtin-log.c
blob
|
blame
|
history
|
raw
-rw-r--r--
11753
builtin-ls-files.c
blob
|
blame
|
history
|
raw
-rw-r--r--
3540
builtin-ls-tree.c
blob
|
blame
|
history
|
raw
-rw-r--r--
17026
builtin-mailinfo.c
blob
|
blame
|
history
|
raw
-rw-r--r--
4186
builtin-mailsplit.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1494
builtin-merge-file.c
blob
|
blame
|
history
|
raw
-rw-r--r--
7625
builtin-mv.c
blob
|
blame
|
history
|
raw
-rw-r--r--
5578
builtin-name-rev.c
blob
|
blame
|
history
|
raw
-rw-r--r--
42265
builtin-pack-objects.c
blob
|
blame
|
history
|
raw
-rw-r--r--
2798
builtin-pack-refs.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1586
builtin-prune-packed.c
blob
|
blame
|
history
|
raw
-rw-r--r--
6228
builtin-prune.c
blob
|
blame
|
history
|
raw
-rw-r--r--
7238
builtin-push.c
blob
|
blame
|
history
|
raw
-rw-r--r--
6625
builtin-read-tree.c
blob
|
blame
|
history
|
raw
-rw-r--r--
5728
builtin-reflog.c
blob
|
blame
|
history
|
raw
-rw-r--r--
5491
builtin-repo-config.c
blob
|
blame
|
history
|
raw
-rw-r--r--
10143
builtin-rerere.c
blob
|
blame
|
history
|
raw
-rw-r--r--
6537
builtin-rev-list.c
blob
|
blame
|
history
|
raw
-rw-r--r--
7862
builtin-rev-parse.c
blob
|
blame
|
history
|
raw
-rw-r--r--
5510
builtin-rm.c
blob
|
blame
|
history
|
raw
-rw-r--r--
812
builtin-runstatus.c
blob
|
blame
|
history
|
raw
-rw-r--r--
8046
builtin-shortlog.c
blob
|
blame
|
history
|
raw
-rw-r--r--
19616
builtin-show-branch.c
blob
|
blame
|
history
|
raw
-rw-r--r--
5831
builtin-show-ref.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1012
builtin-stripspace.c
blob
|
blame
|
history
|
raw
-rw-r--r--
728
builtin-symbolic-ref.c
blob
|
blame
|
history
|
raw
-rw-r--r--
2175
builtin-tar-tree.c
blob
|
blame
|
history
|
raw
-rw-r--r--
9218
builtin-unpack-objects.c
blob
|
blame
|
history
|
raw
-rw-r--r--
16965
builtin-update-index.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1583
builtin-update-ref.c
blob
|
blame
|
history
|
raw
-rw-r--r--
4216
builtin-upload-archive.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1679
builtin-verify-pack.c
blob
|
blame
|
history
|
raw
-rw-r--r--
2157
builtin-write-tree.c
blob
|
blame
|
history
|
raw
-rw-r--r--
5203
builtin.h
blob
|
blame
|
history
|
raw
-rw-r--r--
12816
cache-tree.c
blob
|
blame
|
history
|
raw
-rw-r--r--
921
cache-tree.h
blob
|
blame
|
history
|
raw
-rw-r--r--
15932
cache.h
blob
|
blame
|
history
|
raw
-rwxr-xr-x
588
check-builtins.sh
blob
|
blame
|
history
|
raw
-rw-r--r--
517
check-racy.c
blob
|
blame
|
history
|
raw
-rw-r--r--
3230
color.c
blob
|
blame
|
history
|
raw
-rw-r--r--
376
color.h
blob
|
blame
|
history
|
raw
-rw-r--r--
25610
combine-diff.c
blob
|
blame
|
history
|
raw
-rw-r--r--
27006
commit.c
blob
|
blame
|
history
|
raw
-rw-r--r--
3674
commit.h
blob
|
blame
|
history
|
raw
drwxr-xr-x
-
compat
tree
|
history
-rw-r--r--
18037
config.c
blob
|
blame
|
history
|
raw
-rw-r--r--
906
config.mak.in
blob
|
blame
|
history
|
raw
-rw-r--r--
11077
configure.ac
blob
|
blame
|
history
|
raw
-rw-r--r--
17613
connect.c
blob
|
blame
|
history
|
raw
drwxr-xr-x
-
contrib
tree
|
history
-rw-r--r--
7455
convert-objects.c
blob
|
blame
|
history
|
raw
-rw-r--r--
692
copy.c
blob
|
blame
|
history
|
raw
-rw-r--r--
2950
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--
26409
daemon.c
blob
|
blame
|
history
|
raw
-rw-r--r--
17399
date.c
blob
|
blame
|
history
|
raw
-rw-r--r--
3273
delta.h
blob
|
blame
|
history
|
raw
-rw-r--r--
3798
describe.c
blob
|
blame
|
history
|
raw
-rw-r--r--
14129
diff-delta.c
blob
|
blame
|
history
|
raw
-rw-r--r--
8910
diff-lib.c
blob
|
blame
|
history
|
raw
-rw-r--r--
71880
diff.c
blob
|
blame
|
history
|
raw
-rw-r--r--
6811
diff.h
blob
|
blame
|
history
|
raw
-rw-r--r--
8686
diffcore-break.c
blob
|
blame
|
history
|
raw
-rw-r--r--
5269
diffcore-delta.c
blob
|
blame
|
history
|
raw
-rw-r--r--
2274
diffcore-order.c
blob
|
blame
|
history
|
raw
-rw-r--r--
3301
diffcore-pickaxe.c
blob
|
blame
|
history
|
raw
-rw-r--r--
13291
diffcore-rename.c
blob
|
blame
|
history
|
raw
-rw-r--r--
3775
diffcore.h
blob
|
blame
|
history
|
raw
-rw-r--r--
9752
dir.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1719
dir.h
blob
|
blame
|
history
|
raw
-rw-r--r--
1526
dump-cache-tree.c
blob
|
blame
|
history
|
raw
-rw-r--r--
4193
entry.c
blob
|
blame
|
history
|
raw
-rw-r--r--
2347
environment.c
blob
|
blame
|
history
|
raw
-rw-r--r--
2842
exec_cmd.c
blob
|
blame
|
history
|
raw
-rw-r--r--
295
exec_cmd.h
blob
|
blame
|
history
|
raw
-rw-r--r--
16726
fetch-pack.c
blob
|
blame
|
history
|
raw
-rw-r--r--
6770
fetch.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1639
fetch.h
blob
|
blame
|
history
|
raw
-rw-r--r--
14297
fsck-objects.c
blob
|
blame
|
history
|
raw
-rwxr-xr-x
558
generate-cmdlist.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
16242
git-add--interactive.perl
blob
|
blame
|
history
|
raw
-rwxr-xr-x
11098
git-am.sh
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
5865
git-bisect.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
5578
git-checkout.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
1542
git-clean.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
10132
git-clone.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
13587
git-commit.sh
blob
|
blame
|
history
|
raw
-rw-r--r--
5042
git-compat-util.h
blob
|
blame
|
history
|
raw
-rwxr-xr-x
7681
git-cvsexportcommit.perl
blob
|
blame
|
history
|
raw
-rwxr-xr-x
25576
git-cvsimport.perl
blob
|
blame
|
history
|
raw
-rwxr-xr-x
93104
git-cvsserver.perl
blob
|
blame
|
history
|
raw
-rwxr-xr-x
11478
git-fetch.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
265
git-gc.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
2232
git-ls-remote.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
2415
git-merge-octopus.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
3195
git-merge-one-file.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
356
git-merge-ours.sh
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
10724
git-merge.sh
blob
|
blame
|
history
|
raw
-rw-r--r--
10732
git-p4import.py
blob
|
blame
|
history
|
raw
-rwxr-xr-x
6374
git-parse-remote.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
2924
git-pull.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
3028
git-quiltimport.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
8337
git-rebase.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
4111
git-relink.perl
blob
|
blame
|
history
|
raw
-rwxr-xr-x
2682
git-repack.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
847
git-request-pull.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
6195
git-rerere.perl
blob
|
blame
|
history
|
raw
-rwxr-xr-x
2242
git-reset.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
2715
git-resolve.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
4299
git-revert.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
15610
git-send-email.perl
blob
|
blame
|
history
|
raw
-rwxr-xr-x
1140
git-sh-setup.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
81996
git-svn.perl
blob
|
blame
|
history
|
raw
-rwxr-xr-x
24757
git-svnimport.perl
blob
|
blame
|
history
|
raw
-rwxr-xr-x
2777
git-tag.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
703
git-verify-tag.sh
blob
|
blame
|
history
|
raw
-rw-r--r--
9796
git.c
blob
|
blame
|
history
|
raw
-rw-r--r--
7156
git.spec.in
blob
|
blame
|
history
|
raw
-rwxr-xr-x
174567
gitk
blob
|
blame
|
history
|
raw
drwxr-xr-x
-
gitweb
tree
|
history
-rw-r--r--
13155
grep.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1629
grep.h
blob
|
blame
|
history
|
raw
-rw-r--r--
1892
hash-object.c
blob
|
blame
|
history
|
raw
-rw-r--r--
4883
help.c
blob
|
blame
|
history
|
raw
-rw-r--r--
26687
http-fetch.c
blob
|
blame
|
history
|
raw
-rw-r--r--
67825
http-push.c
blob
|
blame
|
history
|
raw
-rw-r--r--
11603
http.c
blob
|
blame
|
history
|
raw
-rw-r--r--
2530
http.h
blob
|
blame
|
history
|
raw
-rw-r--r--
5602
ident.c
blob
|
blame
|
history
|
raw
-rw-r--r--
29137
imap-send.c
blob
|
blame
|
history
|
raw
-rw-r--r--
25291
index-pack.c
blob
|
blame
|
history
|
raw
-rw-r--r--
2095
interpolate.c
blob
|
blame
|
history
|
raw
-rw-r--r--
583
interpolate.h
blob
|
blame
|
history
|
raw
-rw-r--r--
3428
list-objects.c
blob
|
blame
|
history
|
raw
-rw-r--r--
382
list-objects.h
blob
|
blame
|
history
|
raw
-rw-r--r--
6274
local-fetch.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1481
lockfile.c
blob
|
blame
|
history
|
raw
-rw-r--r--
8883
log-tree.c
blob
|
blame
|
history
|
raw
-rw-r--r--
386
log-tree.h
blob
|
blame
|
history
|
raw
-rw-r--r--
1160
merge-base.c
blob
|
blame
|
history
|
raw
-rw-r--r--
2387
merge-file.c
blob
|
blame
|
history
|
raw
-rw-r--r--
2732
merge-index.c
blob
|
blame
|
history
|
raw
-rw-r--r--
34560
merge-recursive.c
blob
|
blame
|
history
|
raw
-rw-r--r--
8013
merge-tree.c
blob
|
blame
|
history
|
raw
-rw-r--r--
3979
mktag.c
blob
|
blame
|
history
|
raw
-rw-r--r--
3161
mktree.c
blob
|
blame
|
history
|
raw
drwxr-xr-x
-
mozilla-sha1
tree
|
history
-rw-r--r--
3108
object-refs.c
blob
|
blame
|
history
|
raw
-rw-r--r--
5495
object.c
blob
|
blame
|
history
|
raw
-rw-r--r--
2473
object.h
blob
|
blame
|
history
|
raw
-rw-r--r--
4336
pack-check.c
blob
|
blame
|
history
|
raw
-rw-r--r--
14610
pack-redundant.c
blob
|
blame
|
history
|
raw
-rw-r--r--
382
pack.h
blob
|
blame
|
history
|
raw
-rw-r--r--
974
pager.c
blob
|
blame
|
history
|
raw
-rw-r--r--
2204
patch-delta.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1589
patch-id.c
blob
|
blame
|
history
|
raw
-rw-r--r--
2294
path-list.c
blob
|
blame
|
history
|
raw
-rw-r--r--
603
path-list.h
blob
|
blame
|
history
|
raw
-rw-r--r--
6143
path.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1293
peek-remote.c
blob
|
blame
|
history
|
raw
drwxr-xr-x
-
perl
tree
|
history
-rw-r--r--
2521
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--
7797
quote.c
blob
|
blame
|
history
|
raw
-rw-r--r--
2057
quote.h
blob
|
blame
|
history
|
raw
-rw-r--r--
25491
read-cache.c
blob
|
blame
|
history
|
raw
-rw-r--r--
10937
receive-pack.c
blob
|
blame
|
history
|
raw
-rw-r--r--
27491
refs.c
blob
|
blame
|
history
|
raw
-rw-r--r--
2006
refs.h
blob
|
blame
|
history
|
raw
-rw-r--r--
31529
revision.c
blob
|
blame
|
history
|
raw
-rw-r--r--
3084
revision.h
blob
|
blame
|
history
|
raw
-rw-r--r--
1761
rsh.c
blob
|
blame
|
history
|
raw
-rw-r--r--
159
rsh.h
blob
|
blame
|
history
|
raw
-rw-r--r--
1858
run-command.c
blob
|
blame
|
history
|
raw
-rw-r--r--
594
run-command.h
blob
|
blame
|
history
|
raw
-rw-r--r--
9598
send-pack.c
blob
|
blame
|
history
|
raw
-rw-r--r--
5218
server-info.c
blob
|
blame
|
history
|
raw
-rw-r--r--
6201
setup.c
blob
|
blame
|
history
|
raw
-rw-r--r--
45473
sha1_file.c
blob
|
blame
|
history
|
raw
-rw-r--r--
12993
sha1_name.c
blob
|
blame
|
history
|
raw
-rw-r--r--
2313
shallow.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1171
shell.c
blob
|
blame
|
history
|
raw
-rw-r--r--
594
show-index.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1950
sideband.c
blob
|
blame
|
history
|
raw
-rw-r--r--
335
sideband.h
blob
|
blame
|
history
|
raw
-rw-r--r--
3669
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--
2858
ssh-upload.c
blob
|
blame
|
history
|
raw
-rw-r--r--
768
strbuf.c
blob
|
blame
|
history
|
raw
-rw-r--r--
216
strbuf.h
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--
378
test-date.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1762
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--
4024
trace.c
blob
|
blame
|
history
|
raw
-rw-r--r--
6264
tree-diff.c
blob
|
blame
|
history
|
raw
-rw-r--r--
4396
tree-walk.c
blob
|
blame
|
history
|
raw
-rw-r--r--
863
tree-walk.h
blob
|
blame
|
history
|
raw
-rw-r--r--
5075
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--
18641
unpack-trees.c
blob
|
blame
|
history
|
raw
-rw-r--r--
890
unpack-trees.h
blob
|
blame
|
history
|
raw
-rw-r--r--
457
update-server-info.c
blob
|
blame
|
history
|
raw
-rw-r--r--
16359
upload-pack.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1973
usage.c
blob
|
blame
|
history
|
raw
-rw-r--r--
9753
utf8.c
blob
|
blame
|
history
|
raw
-rw-r--r--
389
utf8.h
blob
|
blame
|
history
|
raw
-rw-r--r--
1313
var.c
blob
|
blame
|
history
|
raw
-rw-r--r--
831
write_or_die.c
blob
|
blame
|
history
|
raw
-rw-r--r--
7703
wt-status.c
blob
|
blame
|
history
|
raw
-rw-r--r--
451
wt-status.h
blob
|
blame
|
history
|
raw
-rw-r--r--
2659
xdiff-interface.c
blob
|
blame
|
history
|
raw
-rw-r--r--
500
xdiff-interface.h
blob
|
blame
|
history
|
raw
drwxr-xr-x
-
xdiff
tree
|
history