projects
/
git
/ tree
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
| tree
snapshot
git-merge-ours: make sure our index matches HEAD
-rw-r--r--
1564
.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--
12825
Makefile
blob
|
blame
|
history
|
raw
-rw-r--r--
23942
README
blob
|
blame
|
history
|
raw
-rw-r--r--
40546
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--
13687
cache.h
blob
|
blame
|
history
|
raw
-rw-r--r--
1092
cat-file.c
blob
|
blame
|
history
|
raw
-rw-r--r--
248
check-ref-format.c
blob
|
blame
|
history
|
raw
-rw-r--r--
4049
checkout-index.c
blob
|
blame
|
history
|
raw
-rw-r--r--
6701
clone-pack.c
blob
|
blame
|
history
|
raw
-rwxr-xr-x
1720
cmd-rename.sh
blob
|
blame
|
history
|
raw
-rw-r--r--
3126
commit-tree.c
blob
|
blame
|
history
|
raw
-rw-r--r--
13845
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--
4017
config.c
blob
|
blame
|
history
|
raw
-rw-r--r--
11470
connect.c
blob
|
blame
|
history
|
raw
-rw-r--r--
7215
convert-objects.c
blob
|
blame
|
history
|
raw
-rw-r--r--
688
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--
13639
daemon.c
blob
|
blame
|
history
|
raw
-rw-r--r--
10502
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--
2999
diff-files.c
blob
|
blame
|
history
|
raw
-rw-r--r--
5597
diff-index.c
blob
|
blame
|
history
|
raw
-rw-r--r--
2279
diff-stages.c
blob
|
blame
|
history
|
raw
-rw-r--r--
5863
diff-tree.c
blob
|
blame
|
history
|
raw
-rw-r--r--
33733
diff.c
blob
|
blame
|
history
|
raw
-rw-r--r--
3973
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--
12921
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--
1684
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--
10380
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--
12421
fsck-objects.c
blob
|
blame
|
history
|
raw
-rw-r--r--
514
get-tar-commit-id.c
blob
|
blame
|
history
|
raw
-rwxr-xr-x
614
git-add.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
8330
git-am.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
2888
git-applymbox.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
4918
git-applypatch.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
23526
git-archimport.perl
blob
|
blame
|
history
|
raw
-rwxr-xr-x
5226
git-bisect.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
2348
git-branch.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
3339
git-checkout.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
1824
git-cherry.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
4788
git-clone.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
5588
git-commit.sh
blob
|
blame
|
history
|
raw
-rw-r--r--
2889
git-core.spec.in
blob
|
blame
|
history
|
raw
-rwxr-xr-x
358
git-count-objects.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
21280
git-cvsimport.perl
blob
|
blame
|
history
|
raw
-rwxr-xr-x
952
git-diff.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
7794
git-fetch.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
1824
git-fmt-merge-msg.perl
blob
|
blame
|
history
|
raw
-rwxr-xr-x
5926
git-format-patch.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
656
git-grep.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
351
git-log.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
1620
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
356
git-merge-ours.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
28972
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
6312
git-merge.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
4695
git-mv.perl
blob
|
blame
|
history
|
raw
-rwxr-xr-x
2250
git-octopus.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
4033
git-parse-remote.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
541
git-prune.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
2098
git-pull.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
1144
git-push.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
1541
git-rebase.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
4111
git-relink.perl
blob
|
blame
|
history
|
raw
-rwxr-xr-x
1607
git-rename.perl
blob
|
blame
|
history
|
raw
-rwxr-xr-x
1615
git-repack.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
851
git-request-pull.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
2225
git-reset.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
2384
git-resolve.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
3924
git-revert.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
8637
git-send-email.perl
blob
|
blame
|
history
|
raw
-rwxr-xr-x
590
git-sh-setup.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
4046
git-shortlog.perl
blob
|
blame
|
history
|
raw
-rwxr-xr-x
1893
git-status.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
18241
git-svnimport.perl
blob
|
blame
|
history
|
raw
-rwxr-xr-x
1771
git-tag.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
344
git-verify-tag.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
264
git-whatchanged.sh
blob
|
blame
|
history
|
raw
-rwxr-xr-x
915
git.sh
blob
|
blame
|
history
|
raw
-rw-r--r--
6879
gitMergeCommon.py
blob
|
blame
|
history
|
raw
-rwxr-xr-x
98429
gitk
blob
|
blame
|
history
|
raw
-rw-r--r--
973
hash-object.c
blob
|
blame
|
history
|
raw
-rw-r--r--
32758
http-fetch.c
blob
|
blame
|
history
|
raw
-rw-r--r--
4431
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--
6825
init-db.c
blob
|
blame
|
history
|
raw
-rw-r--r--
5822
local-fetch.c
blob
|
blame
|
history
|
raw
-rw-r--r--
15199
ls-files.c
blob
|
blame
|
history
|
raw
-rw-r--r--
5942
ls-tree.c
blob
|
blame
|
history
|
raw
-rw-r--r--
15310
mailinfo.c
blob
|
blame
|
history
|
raw
-rw-r--r--
3131
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--
5376
name-rev.c
blob
|
blame
|
history
|
raw
-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--
13546
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--
1541
patch-id.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1770
path.c
blob
|
blame
|
history
|
raw
-rw-r--r--
973
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--
1499
prune-packed.c
blob
|
blame
|
history
|
raw
-rw-r--r--
5388
quote.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1547
quote.h
blob
|
blame
|
history
|
raw
-rw-r--r--
14093
read-cache.c
blob
|
blame
|
history
|
raw
-rw-r--r--
15945
read-tree.c
blob
|
blame
|
history
|
raw
-rw-r--r--
6578
receive-pack.c
blob
|
blame
|
history
|
raw
-rw-r--r--
9014
refs.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1036
refs.h
blob
|
blame
|
history
|
raw
-rw-r--r--
20039
rev-list.c
blob
|
blame
|
history
|
raw
-rw-r--r--
5918
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--
7171
send-pack.c
blob
|
blame
|
history
|
raw
-rw-r--r--
12190
server-info.c
blob
|
blame
|
history
|
raw
-rw-r--r--
2539
setup.c
blob
|
blame
|
history
|
raw
-rw-r--r--
35941
sha1_file.c
blob
|
blame
|
history
|
raw
-rw-r--r--
9834
sha1_name.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1096
shell.c
blob
|
blame
|
history
|
raw
-rw-r--r--
12513
show-branch.c
blob
|
blame
|
history
|
raw
-rw-r--r--
593
show-index.c
blob
|
blame
|
history
|
raw
-rw-r--r--
3554
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
-rw-r--r--
752
symbolic-ref.c
blob
|
blame
|
history
|
raw
drwxr-xr-x
-
t
tree
|
history
-rw-r--r--
2556
tag.c
blob
|
blame
|
history
|
raw
-rw-r--r--
471
tag.h
blob
|
blame
|
history
|
raw
-rw-r--r--
11033
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--
6260
tree-diff.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--
12160
update-index.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1927
update-ref.c
blob
|
blame
|
history
|
raw
-rw-r--r--
432
update-server-info.c
blob
|
blame
|
history
|
raw
-rw-r--r--
6420
upload-pack.c
blob
|
blame
|
history
|
raw
-rw-r--r--
629
usage.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1339
var.c
blob
|
blame
|
history
|
raw
-rw-r--r--
1147
verify-pack.c
blob
|
blame
|
history
|
raw
-rw-r--r--
3850
write-tree.c
blob
|
blame
|
history
|
raw