repo.or.cz
/
git
/
platforms.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
[PATCH] Finish making --emu23 equivalent to pure 2-way merge.
2005-06-13
J
unio C Hamano
[PATCH]
Finis
h
ma
k
ing --emu23
e
qu
i
valent to p
u
r
e
2
.
.
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-13
Junio C
H
aman
o
[PATCH]
r
ea
d
-tree: fix too stron
g
index requireme
n
t
.
.
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-13
Junio
C Ha
m
ano
[PATCH] read
-
tree
--emu23
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-13
Junio C
H
amano
[PATCH] Clean up re
a
d-tree two-
w
ay
t
ests
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-13
Junio
C
H
a
ma
n
o
[PATCH] Add --diff-filter
=
outpu
t
rest
r
iction to diff
.
.
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-13
J
u
nio C Hama
n
o
[PATCH] diff-tree: --fin
d
-copies-harder
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-13
Junio
C
Ha
m
ano
[PATCH]
T
utori
a
l update t
o
a
djust
f
or -B
f
ix
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-13
J
u
nio C Haman
o
[PATC
H
]
F
ix rename/copy when d
e
a
lin
g
with t
e
mporari
l
y
.
.
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-13
Linus Torva
l
ds
git
-
whatchan
g
ed
:
make de
f
ault
o
utput forma
t
be
p
r
e
tty
.
commit
|
commitdiff
|
tree
2005-06-13
Li
n
us Tor
v
alds
git-diff-tree: fix
output with just "--pret
t
y"
.
commit
|
commitdiff
|
tree
2005-06-13
Junio C Hamano
[PA
T
CH] Supp
o
rt co
m
mit_format in diff-tree
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-13
Junio C Ham
a
no
[PATCH] Re-
F
ix SIGSE
G
V on unmerged files in git-diff
.
.
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-12
Linus
Torvalds
git-apply: ignor
e
empty git heade
r
s
commit
|
commitdiff
|
tree
2005-06-10
J
unio C Hamano
[P
A
TCH] Bug
f
i
x
:
r
ead-cache
.
c:wri
t
e_cache
(
)
m
i
srecords
.
.
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-09
Linus Torvalds
git-re
a
d
-tree: remove deleted
f
iles in the worki
n
g
.
.
.
commit
|
commitdiff
|
tree
2005-06-09
Ju
n
i
o C Hamano
[
PATCH] Add git
-
dif
f
-
s
t
a
g
es command
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-09
Linus Torvalds
git-read-
t
ree: add "-
-
reset" fla
g
commit
|
commitdiff
|
tree
2005-06-09
Linus Tor
v
alds
O
n
e
mor
e
time
.
.
C
l
ean
up
g
it-mer
g
e-one-file-
s
cript
commit
|
commitdiff
|
tree
2005-06-09
Linus Torvalds
Fix up git
-
me
r
ge-one-file-script
commit
|
commitdiff
|
tree
2005-06-08
Linus
Torvalds
Merge my and P
e
tr's git
-
me
r
ge-one
-
file-s
c
r
i
pt modificat
i
ons
commit
|
commitdiff
|
tree
2005-06-08
P
etr Baudis
[PATCH] git-merg
e
-o
n
e-f
i
le-script cleanup
s
from Co
g
ito
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-08
Linu
s
T
o
rvalds
Make
sure we er
r
or
o
u
t
i
f
we can't r
e
move a file o
n
.
.
.
commit
|
commitdiff
|
tree
2005-06-08
Petr Baudis
[PATCH] Tidy u
p
s
ome rev-list-related stuf
f
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-08
Junio C Hamano
[P
A
TCH] Add r
e
ad-tree -m 3-way merge t
e
sts
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-08
Pe
t
r Ba
u
di
s
[PA
T
CH
]
Fix
g
it-merg
e
-one-file p
e
rmis
s
i
o
n
s
a
uto-m
e
r
g
ing
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-08
L
inus Torvald
s
Remove MERGE_HEAD after c
o
mmitt
i
ng merge
commit
|
commitdiff
|
tree
2005-06-08
Linus Torv
a
lds
Make "git commit"
w
or
k
correctly
i
n the
p
resense of
.
.
.
commit
|
commitdiff
|
tree
2005-06-08
Linus
T
o
rvalds
cvs-migration: add more of a he
a
der to
t
he "annotate
.
.
.
commit
|
commitdiff
|
tree
2005-06-08
Christian
M
e
der
[PATCH]
M
iniscule correction of diff-format
.
txt
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-08
Ja
s
on
M
cMu
l
lan
[P
A
TCH] Anal retentive
'const unsi
g
ned char *sha1'
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-08
Jo
n
as Fonseca
[P
A
TC
H
] git-d
i
ff-cache: h
a
ndle pathspec be
g
inning with
.
.
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-08
Linus Torvalds
Leave merge failures in the f
i
les
y
stem
commit
|
commitdiff
|
tree
2005-06-08
Linu
s
Torvalds
F
i
x
S
IGSEGV on unmerged
files in
g
i
t
-
diff-files -p
commit
|
commitdiff
|
tree
2005-06-08
J
unio C
H
am
a
no
[PATCH] Tests: read
-
tree -m test u
p
date
s
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-08
Lin
u
s Torval
d
s
M
a
ke def
a
u
lt merge mes
s
ages denser
.
commit
|
commitdiff
|
tree
2005-06-08
Jon Seymour
[PATCH] th
r
ee
--mer
g
e-or
d
e
r
b
ug f
i
xes
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-08
Sven Ver
d
o
ol
a
ege
[PATCH] gi
t
-cvs2git: create tags
commit
|
commitdiff
|
tree
2005-06-08
L
i
nus Torvalds
git-appl
y
:
c
reatig
n
empty files is n
o
nfatal
commit
|
commitdiff
|
tree
2005-06-07
Linu
s
Tor
v
alds
T
a
l
k about "git cvsimport" in
t
h
e
cvs
migrati
o
n d
o
c
s
commit
|
commitdiff
|
tree
2005-06-07
Ju
n
io
C
Hamano
[PATCH] Documentation: des
c
ribe diff tweaking (
f
ix)
.
commit
|
commitdiff
|
tree
2005-06-07
Juni
o
C Hamano
[
P
ATCH
]
Start cvs-migration documentati
o
n
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-07
Lin
u
s Torvalds
git-re
a
d-tr
e
e
: -u without -m
is meaningless
.
Do
n
't
.
.
.
commit
|
commitdiff
|
tree
2005-06-07
Linus Torval
d
s
git-r
e
ad-tree: make one-wa
y
merge also hon
o
r th
e
"u
p
date
.
.
.
commit
|
commitdiff
|
tree
2005-06-07
Junio C Hama
n
o
[PATCH] read-tree: updat
e
documenta
t
ion for 3-way me
r
ge
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-07
L
inus
T
orvalds
Add CVS impo
r
t scripts a
n
d programs
commit
|
commitdiff
|
tree
2005-06-07
Linus To
r
va
l
ds
gi
t
-ssh-push/
p
ull
:
usabili
t
y improvemen
t
s
commit
|
commitdiff
|
tree
2005-06-07
Timo Hirvonen
[PAT
C
H] Us
e
ntohs instead of htons
t
o convert
c
e
_flags
.
.
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-07
Juni
o
C Hamano
[PATCH] read-tree: sav
e
more
u
s
er hassles during
fast
.
.
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-07
Daniel
B
ar
k
a
l
ow
[PATCH] Document git-ssh-pul
l
and git-ssh-pu
s
h
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-07
Linus Torvalds
git-reso
l
ve-script: stop when the automat
e
d
m
erge fails
commit
|
commitdiff
|
tree
2005-06-07
Linus T
o
rvalds
M
a
ke
f
et
c
h/pull scripts
terminat
e
cleanly o
n
e
rrors
commit
|
commitdiff
|
tree
2005-06-07
Linu
s
Torvalds
git-resolve-
s
c
ript:
don't wait for three seconds any
.
.
.
commit
|
commitdiff
|
tree
2005-06-07
Da
n
i
e
l
Barkalow
[PATCH
]
-
w
suppor
t
fo
r
git-s
s
h
-
p
ull/push
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-07
Daniel Barkalow
[
PA
T
CH] Generic suppo
r
t for pu
l
ling re
f
s
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-07
D
aniel Barkalow
[P
A
T
CH] rsh
.
c
e
nvironment varia
b
le
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-07
Daniel Barkalo
w
[PATCH] Operat
i
ons on ref
s
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-06
Linus
Torvalds
g
it-read-tree: some "final" cleanups
commit
|
commitdiff
|
tree
2005-06-06
L
i
nus Torvalds
g
i
t-read
-
tree: simplify merge lo
o
ps e
n
o
r
mously
commit
|
commitdiff
|
tree
2005-06-06
J
u
nio C
H
amano
[PAT
C
H
] index locking like
e
v
e
rybody else
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-06
Linus Torvalds
Add "__n
o
return_
_
" att
r
ibute to die() an
d
usage(
)
commit
|
commitdiff
|
tree
2005-06-06
Linus
T
orvalds
git-r
e
v
-lis
t
:
make sure
t
o link with ssl libraries
commit
|
commitdiff
|
tree
2005-06-06
jon@blackcubes
.
d
yndn
.
.
.
[PATCH] Modify git-rev-
l
i
st to linearise th
e
c
ommit
.
.
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-06
Linus Torvalds
Fix off-by-one in new three-way
-
merge updates
commit
|
commitdiff
|
tree
2005-06-06
Junio C
H
amano
[PATCH
]
3-
w
ay merge tests for new "git-read-tree -m"?
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-06
Linus Torvalds
T
hree-wa
y
m
e
rge: fix silly
b
ug that
m
ade t
r
ivial
m
e
rges
.
.
.
commit
|
commitdiff
|
tree
2005-06-06
Linus To
r
vald
s
Fix entry
.
c
d
ependen
c
y
and c
o
mpile
problem
commit
|
commitdiff
|
tree
2005-06-06
Lin
u
s Torval
d
s
git-r
e
ad-
t
ree: fix
u
p two-way merge
commit
|
commitdiff
|
tree
2005-06-06
Linus Torvalds
More
work on
m
erging with git-read-t
r
ee
.
.
commit
|
commitdiff
|
tree
2005-06-06
Linus Torva
l
ds
Make fiel
c
he
c
kout function availa
b
le to the gi
t
library
commit
|
commitdiff
|
tree
2005-06-06
Linus Torvalds
git-
r
ead-tree
:
fix up three
-
way
m
erge tests
commit
|
commitdiff
|
tree
2005-06-06
Linus Torv
a
lds
git-re
a
d-
t
ree: be a lot more
c
a
ref
u
l
about merging
.
.
.
commit
|
commitdiff
|
tree
2005-06-05
Petr Baudis
[PATCH
]
Make git-update-cac
h
e
--force-remove regular
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-05
Junio C Hamano
[PATCH] rena
m
e git-rpush and git-rpul
l
to git-ssh-pus
h
.
.
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-05
Linus T
o
rvalds
diff 're
n
ame' format change
.
commit
|
commitdiff
|
tree
2005-06-05
Linus To
r
v
a
l
d
s
git-apply
:
c
o
nsider it an error to app
l
y no
c
ha
n
ges
commit
|
commitdiff
|
tree
2005-06-05
Ju
n
io C Hamano
[
PATCH] Doc
u
mentat
i
on: describe git ext
e
nded diff head
e
rs
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-05
Ju
n
io C Haman
o
[
P
ATCH] Do
c
ume
n
t
a
tion: describe
diff tweaking
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-05
L
i
nus Torvalds
git-a
p
pl
y
:
f
ix rename header parsing
commit
|
commitdiff
|
tree
2005-06-05
Junio C Hamano
[PATCH] pull: gracefully recover from
delta retriev
a
l
.
.
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-05
Junio C
H
amano
[PATC
H
] diffcore-break
.
c: various fixes
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-05
Junio C Hamano
[PATCH] diff
.
c: -B argument
passing fix
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-05
J
u
n
io C Hamano
[PATCH] diff
.
c: locat
e
_size_cache()
fix
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-05
Linus Torvalds
git-a
p
ply
:
actually app
l
y p
a
tc
h
es and upd
a
t
e the index
commit
|
commitdiff
|
tree
2005-06-05
Lin
u
s Torvalds
git-apply: fix
appl
y
o
f a new file
commit
|
commitdiff
|
tree
2005-06-05
Linus Torvalds
gi
t
-apply: find offse
t
fragments,
a
nd r
e
ally apply
.
.
.
commit
|
commitdiff
|
tree
2005-06-05
Linus Torvalds
git-apply: first cut
at actually checking
fragme
n
t
.
.
.
commit
|
commitdiff
|
tree
2005-06-05
Linus Torva
l
d
s
git-fs
c
k-cache
:
com
p
lain if no def
a
ult references found
commit
|
commitdiff
|
tree
2005-06-05
Linu
s
Torva
l
ds
p
ret
t
y_
p
rin
t
_commi
t
: add d
i
fferent
f
or
m
a
ts
commit
|
commitdiff
|
tree
2005-06-05
L
i
n
us Torvalds
git-shortl
o
g
:
a
dd name translations
for
'sp
a
rse' repo
commit
|
commitdiff
|
tree
2005-06-05
Linus Torval
d
s
Add git-shortl
o
g perl scrip
t
commit
|
commitdiff
|
tree
2005-06-04
Linus T
o
r
v
a
l
ds
git-rev
-
list: allow arbitrary he
a
d selecti
o
ns, use
.
.
.
commit
|
commitdiff
|
tree
2005-06-03
Daniel Barkalow
[PATCH] ssh-p
r
otoco
l
ver
s
i
o
n,
command types,
respons
e
.
.
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-03
Junio C Hamano
[PATC
H
] diff: Update -B heur
i
stics
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-03
Junio C Ha
m
a
n
o
[PA
T
C
H
] diff:
C
l
e
an up diff_scor
e
opt_pars
e
(
)
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-03
Junio
C
Hamano
[PATCH] diff: F
i
x docs and
a
dd
-
O
to diff
-
helpe
r
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-03
Juni
o
C Hama
n
o
[PA
T
C
H
] Tweak count-delta
i
nterf
a
ce
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-03
Rene Scharfe
[PATCH] g
i
t
-tar-tr
e
e: do
only basic tests in t/t50
0
0
.
.
.
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-03
R
en
e
Sch
a
rf
e
[PATCH] git-tar-tree: fix
write_trailer
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-03
Ren
e
Sc
h
arfe
[PAT
C
H]
g
it-tar-tre
e
: add a te
s
t c
a
se
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
2005-06-03
Ren
e
Scharfe
[PATCH] git-tar-tree: s
m
all doc update
Signed-off-by:
Linus Torvalds
<torvalds@osdl.org>
commit
|
commitdiff
|
tree
next