repo.or.cz
/
git
/
haiku.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'js/diff-ni'
2007-03-11
J
unio
C Haman
o
Merge br
a
nch 'js/di
f
f-ni
'
commit
|
commitdiff
|
tree
2007-03-11
Junio C Ha
m
ano
Merg
e
b
r
anch 'jc/fsck'
commit
|
commitdiff
|
tree
2007-03-11
J
u
nio C Ha
m
a
n
o
Merge branch 'pb/commit-i'
commit
|
commitdiff
|
tree
2007-03-11
Junio C Hamano
Merge br
a
nch 'js/rev
e
rt-
c
he
r
ry'
commit
|
commitdiff
|
tree
2007-03-11
J
unio C Hamano
Merge branch 'sp/make'
commit
|
commitdiff
|
tree
2007-03-11
Junio C
H
aman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-03-11
Junio C Hamano
Merge
b
ranch '
m
aint'
o
f git://linux
-
nfs
.
org/~bfield
s
.
.
.
commit
|
commitdiff
|
tree
2007-03-08
J
u
nio C Ham
a
n
o
Merg
e
b
ranch 'js
/
config-
r
ename'
commit
|
commitdiff
|
tree
2007-03-08
J
unio C Hamano
Me
r
ge
br
a
nch 'master
'
of
g
it://
r
epo
.
or
.
cz/git/fas
t
im
p
ort
commit
|
commitdiff
|
tree
2007-03-07
J
u
nio C Hamano
M
e
rge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-03-06
Junio C Ha
m
ano
Merg
e
branch '
m
ai
n
t'
commit
|
commitdiff
|
tree
2007-03-06
Juni
o
C
Hamano
M
erge b
r
anch 'master' of git://repo
.
or
.
cz/git-gu
i
int
o
.
.
.
commit
|
commitdiff
|
tree
2007-03-06
Junio C
Hamano
git
-
bundle:
fix pack
generat
i
on
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-06
J
u
nio
C
H
a
mano
Merge br
a
n
ch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-03-06
Juni
o
C Hamano
g
it-commi
t
: cd to top before showin
g
the f
i
nal sta
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-06
Junio C Hamano
Merge branch
'ma
s
ter-for-junio' of
g
i
t
:
//rep
o
.
or
.
cz
.
.
.
commit
|
commitdiff
|
tree
2007-03-06
Junio
C
Ha
m
a
n
o
Merge
b
ranch 'maint-for-junio' o
f
git://repo
.
or
.
cz
.
.
.
commit
|
commitdiff
|
tree
2007-03-05
Junio C Hamano
fsck:
exit with n
o
n-zer
o
status
up
o
n errors
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-05
Junio C H
a
ma
n
o
u
n
pack_sha1_f
i
le(): detec
t
corrupt
l
oo
s
e
object files
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-05
Ju
n
io C Hamano
f
s
ck:
fix b
r
oken loose
obj
e
ct c
h
e
c
k
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-05
Junio C Hamano
Post 1
.
5
.
0
.
3 clean
u
p
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-05
Junio
C
H
a
ma
n
o
Merge
b
ra
n
ch
'
js/fetch-progress
'
(early
p
art
)
commit
|
commitdiff
|
tree
2007-03-05
Junio C
H
am
a
no
M
e
rge branch
'
js/symlink'
commit
|
commitdiff
|
tree
2007-03-05
Junio C Ha
m
a
no
Merge
bra
n
ch
'maint'
commit
|
commitdiff
|
tree
2007-03-05
Junio C Hamano
GIT 1
.
5
.
0
.
3
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-04
J
unio
C
Hamano
d
iff-ni: fix the dif
f
with
standard
i
n
p
u
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-04
Junio C
H
amano
di
f
f-ni: all
o
w
r
unning from a sub
d
i
rectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-04
J
u
nio
C
Hamano
Merge b
r
anch 'js/diff-ni' (e
a
rly part)
commit
|
commitdiff
|
tree
2007-03-04
Junio C Hamano
Merge bran
c
h
'maint'
commit
|
commitdiff
|
tree
2007-03-03
Junio C Hamano
git-merg
e
:
fail corr
e
ctly w
h
en we cannot fast
fo
r
wa
r
d
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-03
Juni
o
C H
a
ma
n
o
Merge
br
a
nch
'maint
'
commit
|
commitdiff
|
tree
2007-03-02
Jun
i
o C Ham
a
no
Merge branch 'js/commit-form
a
t'
commit
|
commitdiff
|
tree
2007-03-02
Junio
C Hamano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2007-02-28
Junio C H
a
man
o
Add recent changes to dra
f
t
1
.
5
.
1 re
l
ease n
o
t
e
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Junio
C
Hamano
Merge bran
c
h 'j
s
/commit-by-name'
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
M
e
rg
e
branch 'j
s
/b
u
nd
l
e'
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-02-28
J
unio
C
Hamano
Sta
r
t
p
reparing Release No
t
e
s
for 1
.
5
.
0
.
3
commit
|
commitdiff
|
tree
2007-02-28
J
unio C Haman
o
Documenta
t
io
n
: gi
t
-
r
e
mote add [-t <
b
r
an
c
h>] [-m <bra
n
ch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Ju
n
io
C
Hamano
index
_
fd(): conver
t
b
lob only i
f
it
i
s a re
g
u
lar file
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Ju
n
io
C
H
amano
index_fd()
:
pa
s
s optiona
l
path pa
r
ameter as hint for
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Juni
o
C
Haman
o
index_fd(): use enum obje
c
t
_
t
ype
instead of
t
ype name
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Junio C H
a
mano
Merg
e
b
ra
n
ch
'np
/
types'
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
M
erge branch
'm
c
/sendmail'
commit
|
commitdiff
|
tree
2007-02-28
Junio C Ham
a
no
Merge branch 'j
s
/diff
-
ni' (early
p
a
rt
)
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2007-02-27
J
unio C
Ha
m
ano
Mak
e
'cvs
c
i' lockless in git-cvsserver by using git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-27
Junio C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-02-27
Junio C Hamano
git-a
p
pl
y
: do
n
ot fix whitespace
s
on context lines
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
J
u
n
i
o C Haman
o
Me
r
g
e
branch 'master' in
t
o js/di
f
f-
n
i
commit
|
commitdiff
|
tree
2007-02-26
Junio
C
H
a
ma
n
o
Document
a
tion: l
i
nk in 1
.
5
.
0
.
2 mater
i
al to the top
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
Junio
C Hamano
Merge bran
c
h '
m
aint'
commit
|
commitdiff
|
tree
2007-02-26
Junio
C
Hamano
GIT 1
.
5
.
0
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
Juni
o
C Hamano
D
ocumentation: describe "-f/-t
/
-m" op
t
ions t
o
"git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
Junio C Hama
n
o
d
iff --
c
c: fix display o
f
symlink
conflicts during
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
Junio C Hamano
Merg
e
branc
h
'maint
'
commit
|
commitdiff
|
tree
2007-02-26
J
u
n
io C
H
aman
o
Merge branch 'j
c
/
me
r
g
e-sym
l
i
nk' i
n
to maint
commit
|
commitdiff
|
tree
2007-02-26
Junio C Hamano
merge-recu
r
siv
e
:
fix longstanding bug i
n
m
e
rgin
g
symlinks
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
Juni
o
C Hamano
merge-
i
ndex: fix
longstanding bug
in mergi
n
g
s
ymlin
k
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-25
Junio C
H
amano
diff --
c
ached: giv
e
more s
e
nsible err
o
r messa
g
e when
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-25
Junio C
H
am
a
no
Merg
e
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-02-25
Junio
C
Ham
a
no
A
d
d Releas
e
Notes to pre
p
are
for 1
.
5
.
0
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-25
Junio C Hamano
rerere
:
do not deal with symlinks
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-25
Junio
C Hama
n
o
rerere:
d
o
not skip t
w
o conflicted paths n
e
xt to
e
ach
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-25
Junio C Hamano
M
erg
e
git://repo
.
or
.
cz/git
-
gui into maint
commit
|
commitdiff
|
tree
2007-02-25
Junio C H
a
mano
Don't modify
CREDI
T
S-FILE if it hasn't changed
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-24
J
u
nio C Hamano
Evil
Merge branc
h
'
jc
/
status' (early part) into
j
s
.
.
.
commit
|
commitdiff
|
tree
2007-02-24
Junio C Ham
a
no
Merge branch 'j
s
/apply'
commit
|
commitdiff
|
tree
2007-02-24
Junio C
Hamano
Merge bra
n
ch 'js/no-limit-boundary'
commit
|
commitdiff
|
tree
2007-02-24
Junio C Ham
a
no
Me
r
ge branch 'js/e
t
c-config
'
commit
|
commitdiff
|
tree
2007-02-24
J
un
i
o C Ha
m
ano
Merge
b
ranch
'
main
t
'
commit
|
commitdiff
|
tree
2007-02-24
Jun
i
o
C Hamano
d
i
ff-pa
t
ch: Avoid emitting
d
ouble
-
s
l
a
s
hes in text
u
al
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-24
Junio
C Hamano
bundle: rewor
d
missing
prerequisi
t
e error mes
s
age
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-24
Juni
o
C Hamano
Rew
o
rd git-am 3-
w
ay f
a
llback
f
a
i
l
ure message
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-23
Junio
C
Haman
o
.
m
a
ilm
a
p maintenance after pu
l
l
ing from
g
i
t
-svn
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-23
Juni
o
C Hamano
Merge b
r
a
n
c
h
es 'lt/
c
rlf'
and '
j
c
/
apply-con
f
ig'
commit
|
commitdiff
|
tree
2007-02-23
Junio
C
Hamano
Merg
e
branch 'main
t
'
commit
|
commitdiff
|
tree
2007-02-22
Junio C Hamano
ru
n
_di
f
f_{files,index}(): update
c
a
llin
g
convention
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-22
J
u
nio C
H
a
mano
update-i
n
dex: do not di
e
too ear
l
y in a read-only repository
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-22
Junio
C
Hama
n
o
git-statu
s
: do n
o
t
be tot
a
lly useless i
n
a
read
-
only
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-22
J
u
ni
o
C
Ham
a
no
t41
1
9
:
test autocomp
u
ting -p<
n
> for
t
rad
i
tional diff
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-22
Junio C Ham
a
no
g
i
t-apply: guess
correct -p<n> v
a
lue for non-git pat
c
hes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hamano
git-apply: notice "
d
iff
-
-gi
t
" patch again
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-21
J
u
nio C Hamano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2007-02-21
Junio C Ham
a
no
Merge bran
c
h 'm
a
ster' of
g
it://
r
e
p
o
.
or
.
cz/git-
g
ui into
.
.
.
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hama
n
o
Fix botched "leak fix"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Ha
m
a
n
o
t4119: ad
d
test for traditio
n
al
p
a
t
c
h
and di
f
ferent
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hamano
Merge
bra
n
ch '
f
k/autoconf'
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hamano
Me
r
ge branch
'
js/name-rev-fi
x
'
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hamano
pre
f
ixcmp()
:
f
ix-
u
p leftover strncmp()
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Ha
m
ano
pref
i
x
c
mp(): fix-up mecha
n
ical co
n
version
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-21
Junio
C Hamano
M
e
chanical
co
n
versio
n
to use
prefixcm
p
()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-21
Junio
C Hamano
A
d
d
prefixcm
p
()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hamano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-02-20
Jun
i
o C H
a
mano
L
i
nk 1
.
5
.
0
.
1 d
o
c
u
ment
a
tion
f
r
om the mai
n
pa
g
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-20
Junio C Ham
a
no
git-
a
p
ply: require -p<n>
w
hen w
o
rking in a subdirector
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-20
Jun
i
o C Hama
n
o
git-apply:
d
o
not
l
ose cwd
w
hen r
u
n
f
rom a subdir
e
c
tory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-20
Juni
o
C H
a
mano
Merge branch 'js/diff-color-check'
commit
|
commitdiff
|
tree
2007-02-20
Junio C Hamano
Mer
g
e
branch 'j
c
/fetch-n
o
t
a
gs'
commit
|
commitdiff
|
tree
2007-02-20
Junio C Hamano
Me
r
ge bra
n
ch 'maint
'
commit
|
commitdiff
|
tree
next