repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Improved three-way blob merging code
2006-06-29
Linus Torv
a
lds
Improved thre
e
-way b
l
ob merging code
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-29
Linus Torvalds
Prepare
"
git-
m
erge-tree
"
for f
u
tu
r
e work
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-29
Li
n
us T
o
rvalds
x
d
iff: g
e
ner
a
te "anti-diffs" aka
w
h
at is c
o
mmon to
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-29
Ju
n
io C Hamano
check
o
u
t
-m: fi
x
r
ea
d
-t
r
ee
invocation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-28
Junio C H
a
mano
t/README: s
t
art test
i
ng porcelainis
h
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-28
Johannes Schindelin
Save e
r
rno in handle_alias(
)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-28
Eric Wong
rebase: check fo
r
errors from git-commit
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-28
Martin Langhoff
cvsimp
o
rt - cleanup of the mu
l
t
i
-indexes
h
andling
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-28
J
u
nio C H
a
m
a
n
o
connect
.
c:
c
heck
the commit buff
e
r bound
a
ry wh
i
le parsing
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-28
J
un
i
o C Ham
a
no
conne
c
t
.
c: rem
o
ve unu
s
ed paramet
e
rs from tcp_connect
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-28
T
i
m
o
Hirv
o
nen
M
ake so
m
e strings const
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-28
Er
i
c Wong
rebas
e
: get rid o
f
outdated MRESOLVEMSG
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-28
And
r
ea
s
Eric
s
son
g
i
t
wrapper: fix command name in a
n
error
messa
g
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-28
E
r
ic W
o
n
g
g
it-s
v
n: be verb
o
s
e by default
on fe
t
ch/commi
t
, add
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-28
Eric Wong
git-svn: ad
d
-
-
f
ollow-paren
t
and --n
o
-me
t
adata options
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-28
Eric Wong
git-svn: a
d
d
the
commit-diff command
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-28
E
r
ic
W
ong
git-svn: several g
r
aft-bran
c
hes impr
o
vements
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-28
Eric
W
o
ng
g
i
t
-svn: SVN
1
.
1
.
x library c
o
mpatibi
l
ity
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-28
Junio C H
a
m
ano
c
o
mbine-diff
.
c: type sanity
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-28
Jeff Ki
n
g
quote
.
c: sil
e
nce co
m
piler wa
r
nings
f
r
o
m EMIT
m
acro
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-27
Dennis Stos
b
erg
Fi
x
exp
r
u
sage for Fr
e
eBSD
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-26
Juni
o
C Hamano
Merge branch '
j
c/squas
h
'
commit
|
commitdiff
|
tree
2006-06-26
Junio C Ham
a
no
Merge branch
'jc/diff'
commit
|
commitdiff
|
tree
2006-06-26
Ju
n
io
C
Hamano
M
e
rge branch 'ml/cvsimp
o
rt'
commit
|
commitdiff
|
tree
2006-06-26
Junio C
Ham
a
no
Merge branc
h
'j
s
/diff'
commit
|
commitdiff
|
tree
2006-06-26
Junio C Hamano
Merge
b
ranch
'
e
w/
r
eb
a
se'
commit
|
commitdiff
|
tree
2006-06-26
De
n
nis Stosberg
F
i
x
pk
t
-line
.
h t
o
compi
l
e with a non-GC
C
c
o
m
p
ile
r
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-26
Dennis Stosberg
Solaris needs inclusion of signal
.
h for signa
l
()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-25
Matthias Lederhofer
co
r
rect docu
m
entat
i
on for
g
it grep
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-25
Junio
C
Ha
m
a
no
d
iff --
c
ol
o
r: use $GIT_DIR/conf
i
g
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-25
Eric Wong
rebase: allow --skip t
o
w
ork wit
h
--merge
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-25
Eric Wong
re
b
ase: cleanu
p
reba
s
ing with --merge
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-25
Eric Wong
rebase: allow
--merge opt
i
o
n to handle
pa
t
ches merged
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-25
Yann D
i
rs
o
n
git-commit: filter out log message l
i
nes only when
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-25
Peter Eriksen
Rename saf
e
_strnc
p
y(
)
to strlcpy()
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-25
Joh
a
n
n
e
s Schindelin
apply: replace N
O
_
ACCURATE_DIFF with --inacc
u
rate-eof
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-25
Timo
Hirvo
n
e
n
Clean up di
f
f
.
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-25
Johan
n
es Schi
n
delin
c
v
simport: always s
e
t $ENV{GIT_INDEX_
F
ILE} to
$i
n
dex
.
.
.
commit
|
commitdiff
|
tree
2006-06-24
Martin Langhoff
cvsimport: se
t
u
p indexe
s
correc
t
ly for ancestors
a
n
d
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-24
J
u
nio
C
Ha
m
ano
re
p
o
-
c
onfig: fi
x
print
i
ng of bool
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-24
Ju
n
io C Ham
a
no
d
i
ff --co
l
or:
use reset
s
equen
c
e
w
h
en we mean rese
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-24
Martin Lan
g
hoff
gi
t
-repack -- respect -q and
be quiet
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-24
Junio C Haman
o
git-merge
--squash
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-24
Junio C Hamano
git-pull: abort when fmt-m
e
rge-ms
g
fails
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-24
Jun
i
o
C
Hama
n
o
Merge branch 'pb/error'
commit
|
commitdiff
|
tree
2006-06-24
Junio
C Hamano
usage:
minimum
type fix
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-24
Petr Bau
d
is
Cust
o
mi
z
able err
o
r handlers
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-24
Timo Hirvonen
g
it-m
e
rge: Don't u
s
e -p when outpu
t
tin
g
s
ummary
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-24
J
o
hannes Schindelin
Teach
diff about -b
and -w fl
a
gs
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-23
Jeff King
git-commit: allow -e
o
ption anyw
h
ere on co
m
m
a
nd line
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-23
Johanne
s
Schindelin
patch-id: take "commit"
p
r
efix a
s
well as "diff-tree
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-22
Junio C
Hamano
Makefi
l
e: d
o
no
t
recomp
i
le main programs
w
h
en libraries
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-22
Ma
t
thias
Kestenholz
add GIT-CFLAGS to
.
gi
t
i
gnore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-22
Lin
u
s T
o
rvalds
Tweak diff colo
r
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-22
Junio C H
a
m
ano
M
e
r
g
e
b
ranc
h
'master' into next
commit
|
commitdiff
|
tree
2006-06-22
J
unio C Hamano
Merg
e
branch 'j
s
/lsfix'
commit
|
commitdiff
|
tree
2006-06-22
Junio C
H
amano
Merg
e
b
ranch 'e
w
/rebase'
commit
|
commitdiff
|
tree
2006-06-22
Jun
i
o C
Ham
a
n
o
Merge branch 'jn
/
web'
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
Merg
e
ea
r
ly
p
a
rts of branch 'js/diff'
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
M
e
rg
e
bran
c
h 'jc/
u
pload-cor
r
upt'
commit
|
commitdiff
|
tree
2006-06-22
J
u
n
i
o C Ha
m
ano
Mer
g
e branch 'ew/rebas
e
'
into next
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
Merge
branch 'jn/web' into next
commit
|
commitdiff
|
tree
2006-06-22
Jak
u
b
Narebski
gitweb: whitespace cleanup
a
round '
=
'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-22
Ti
m
o Hirvo
n
en
gitweb
:
Use $hash_base as $search_hash if possibl
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
Merge branch 'jc/waitpid'
commit
|
commitdiff
|
tree
2006-06-22
J
u
nio C Hamano
Merge b
r
anch
'
ff/c9
9
'
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
M
erge branch 'pb/c
o
nfig'
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
Me
r
ge branch '
l
t
/objl
i
st'
commit
|
commitdiff
|
tree
2006-06-22
Eric Wong
git-svn: fix commit --e
d
it flag w
h
en using S
V
N::
libraries
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-22
Juni
o
C Hamano
Makefil
e
:
do not force u
n
needed recompilation upon
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-22
Juni
o
C
Hamano
r
e
b
ase --merge: fix for rebasing
more than
7
commits
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-22
Eric W
.
Biederm
a
n
Check and documen
t
the
options
to prevent
mista
k
e
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-22
Yakov Le
r
ner
Pass
-DDEFAULT_GIT_T
E
MPLATE_DIR onl
y
where actually
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-22
Junio C Ham
a
no
Merge branch 'mast
e
r' into ne
x
t
commit
|
commitdiff
|
tree
2006-06-21
Junio C Hamano
M
e
rge b
r
a
n
ch
'
jc/upload-corru
p
t' into next
commit
|
commitdiff
|
tree
2006-06-21
Ju
n
io C Hamano
M
erg
e
branch 'jn/web' into n
e
xt
commit
|
commitdiff
|
tree
2006-06-21
J
u
n
i
o C Hamano
da
e
mo
n
: send st
d
e
rr to /dev/n
u
ll instead of c
l
osing
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-21
Jakub Narebs
k
i
git
w
eb: Make
use of $PATH_INFO for project parameter
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-21
Linus Torv
a
ld
s
F
i
x grow_refs_hash
(
)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-21
Junio
C Hamano
Mer
g
e bran
c
h 'ew/rebase' i
n
to nex
t
commit
|
commitdiff
|
tree
2006-06-21
Eri
c
Wong
rebase
:
e
r
ror
o
ut
f
or NO_PYTHON if
t
hey use recur
s
ive
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-21
Juni
o
C Hamano
Add renami
n
g
-r
e
bas
e
tes
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-21
Eric Wong
r
e
base: Allow m
e
rge str
a
t
egies
t
o be used whe
n
r
e
basing
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-21
A
ndre N
o
ll
object-r
e
fs: avoid division by zero
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-21
Junio C Hamano
Mer
g
e branch 'ff/c99
'
into next
commit
|
commitdiff
|
tree
2006-06-21
Jun
i
o C
H
amano
Merge
b
ranch 'jc/upload-c
o
rrupt' into next
commit
|
commitdiff
|
tree
2006-06-21
Junio C Hamano
uplo
a
d-pack/fetch-pac
k
:
s
u
p
port side-band co
m
m
u
nica
t
ion
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-21
Ju
n
io C
Hamano
R
etire git-
c
lone-pack
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-21
Ju
n
io
C
H
a
ma
n
o
upload-pack: prepa
r
e for
s
ideba
n
d
messag
e
s
u
pport
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-21
J
unio C Ham
a
no
u
pload-pack: avoid s
e
ndi
n
g an incomplete pa
c
k upon
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-21
Juni
o
C Haman
o
Merge bra
n
ch 'jn/web
'
int
o
next
commit
|
commitdiff
|
tree
2006-06-21
Uwe Zeisberger
F
ix possible ou
t
-of
-
b
o
un
d
s array
a
ccess
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-21
Jaku
b
Narebsk
i
Move $git
b
in earlier in gitweb
.
cgi
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-21
Jak
u
b Nar
e
bski
A
dd git
vers
i
o
n
t
o
gitweb
o
utput
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-21
Jaku
b
Narebski
g
i
t
w
eb
:
whitesp
a
ce
clean
u
p
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-21
Ju
n
i
o
C Ham
a
no
Merge branch
'
master' i
n
to next
commit
|
commitdiff
|
tree
2006-06-21
Junio C Ham
a
no
checkout
-f:
d
o
not lea
v
e untracked w
o
r
k
ing tree files
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-21
David
W
o
o
dhouse
Log peer address
w
hen git-daemon c
a
lled
f
rom inetd
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-20
Junio
C Ha
m
ano
M
e
rge branch 'jn/web' into
next
commit
|
commitdiff
|
tree
2006-06-20
Jakub Narebski
gitweb:
style done with stylesh
e
et
commit
|
commitdiff
|
tree
next