repo.or.cz
/
git
/
dkf.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Prepare "git-merge-tree" for future work
2006-06-29
Li
n
u
s
Torval
d
s
Prepare "git
-
me
r
ge-tree" fo
r
f
uture w
o
rk
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-29
Linus Torvalds
xdiff: generat
e
"anti-diffs" aka w
h
a
t i
s
common
t
o
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-29
Junio
C
H
a
ma
n
o
chec
k
ou
t
-m:
f
i
x
read-tree inv
o
cation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Junio
C
Ha
m
ano
t/README:
start
t
esting porcelaini
s
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Johannes
S
c
hi
n
de
l
in
Save errno in
han
d
le_alias()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Eric
W
ong
reba
s
e: c
h
e
c
k for errors from
g
it-commit
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Marti
n
La
n
ghoff
c
v
simport - cle
a
nu
p
of the multi-
i
ndexes
h
a
ndli
n
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Junio
C Hamano
con
n
ect
.
c: check the
c
ommi
t
buf
f
er
bo
u
nda
r
y
while parsing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Junio C Hamano
co
n
nect
.
c
: rem
o
ve u
n
used
p
arameters from tcp_connect
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Timo Hirvonen
M
ake some str
i
ngs const
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Eric Wong
rebas
e
: get rid of outd
a
ted M
R
ESOLVEMSG
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Andreas E
r
icsson
git wrapper:
f
ix command name
i
n an error message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Eric Won
g
g
it-svn: be ve
r
bose by de
f
ault on fetch/commit, add
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Eric Wong
git
-
s
v
n:
a
dd
-
-follo
w
-pare
n
t
and --no-metad
a
ta options
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Eric W
o
ng
git-svn
:
add the c
o
mmit-diff command
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Eric
Wong
gi
t
-svn: sever
a
l
g
raft-branches improve
m
ents
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Eric
Wong
git-s
v
n:
S
VN 1
.
1
.
x
l
i
brary compatibility
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Junio C Hama
n
o
combine-diff
.
c
:
type sanity
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Jeff King
quote
.
c:
s
ilence compiler warnings
f
rom E
M
IT macro
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-27
Denni
s
S
t
o
sberg
Fix expr
u
sage for
F
r
eeB
S
D
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Junio C Hama
n
o
M
e
rge branch 'jc
/
squash'
commit
|
commitdiff
|
tree
2006-06-26
Junio C
H
amano
Merge
b
ranch 'jc/di
f
f
'
commit
|
commitdiff
|
tree
2006-06-26
Jun
i
o C Hamano
M
e
rge branch 'ml
/
cvsimport'
commit
|
commitdiff
|
tree
2006-06-26
J
u
n
i
o C Hamano
Me
r
ge bran
c
h 'js/d
i
ff'
commit
|
commitdiff
|
tree
2006-06-26
Jun
i
o
C Hamano
Merge branch 'ew/rebase'
commit
|
commitdiff
|
tree
2006-06-26
Denn
i
s S
t
os
b
erg
Fix pkt-line
.
h to compil
e
w
ith a non-GCC
c
ompiler
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Den
n
is Stosberg
Solaris needs inclus
i
on of signal
.
h
f
or signal()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Mat
t
hias
L
ederhofer
correct
d
ocumenta
t
ion for
g
it grep
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Junio C
H
amano
diff -
-
color: use $GIT_DIR/co
n
fig
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
E
r
ic Wong
rebas
e
:
a
llow --skip to
w
ork
with --mer
g
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Eric
Won
g
rebase:
c
leanup reba
s
ing
w
ith --
m
erge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Eri
c
Wong
r
e
ba
s
e
: a
l
low --mer
g
e op
t
ion
t
o h
a
ndle
p
atches merged
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Yann Dirson
gi
t
-com
m
it: filter out log message lines only whe
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Peter Eriksen
Rename safe_strncpy() to strl
c
py()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Johann
e
s Schind
e
lin
ap
p
ly: replace NO_
A
CCURATE_DIFF with --inaccurate
-
eof
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Timo H
i
rvon
e
n
Clean up diff
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Johannes
Sc
h
i
n
delin
cvsimport: always s
e
t $
E
NV{GIT_INDEX_FILE} to
$
in
d
ex
.
.
.
commit
|
commitdiff
|
tree
2006-06-24
Martin Langhoff
cv
s
import: s
e
tup index
e
s correctl
y
for a
n
cest
o
rs
a
n
d
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Junio C Haman
o
r
epo-c
o
n
fi
g
:
fix
p
ri
n
ting of b
o
ol
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Junio C Hamano
d
iff
-
-color: u
s
e res
e
t sequence wh
e
n we mean reset
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Martin Langhoff
git-repack -- respect -q and
b
e qu
i
et
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Junio
C
Hamano
gi
t
-merge --squash
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Junio
C Ha
m
a
no
git-pull: abo
r
t
when fmt-mer
g
e
-msg fai
l
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Junio C
H
amano
Merge branch 'pb
/
e
r
ror'
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
B
audis
Customizable
e
rror handl
e
rs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Timo Hirv
o
nen
git-
m
erge: Don
'
t
use -p when outputting
s
ummary
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
J
ohann
e
s
Schin
d
elin
T
ea
c
h d
i
f
f
about -b and -w f
l
ags
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-23
Jeff K
i
n
g
git-
c
ommit: allow -e option a
n
ywhere on command line
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-23
Johan
n
e
s
Sc
h
indelin
p
atch
-
id:
t
ake "comm
i
t" prefix as well as "d
i
ff-
t
ree
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Junio
C
Hamano
Makefile: do not recompile
main programs when libraries
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
M
a
tthias Kestenholz
add GIT-CFLAGS to
.
gitig
n
o
r
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
L
inus Torvalds
Tweak d
i
ff colors
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
Me
r
g
e
branch 'master' into ne
x
t
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
Merge branch 'j
s
/lsfi
x
'
commit
|
commitdiff
|
tree
2006-06-22
Juni
o
C Hamano
Merge
branch
'
ew/re
b
ase'
commit
|
commitdiff
|
tree
2006-06-22
Junio C
Hama
n
o
M
erge
b
ranch 'jn/web'
commit
|
commitdiff
|
tree
2006-06-22
Juni
o
C Hamano
Merge early parts o
f
branch 'js/
d
i
ff'
commit
|
commitdiff
|
tree
2006-06-22
Junio C
H
ama
n
o
M
e
rge b
r
anch
'
jc/upload-corrupt'
commit
|
commitdiff
|
tree
2006-06-22
Junio C H
a
mano
Merge branch 'e
w
/rebase' into next
commit
|
commitdiff
|
tree
2006-06-22
Ju
n
io C
Hama
n
o
Merge branch
'jn/web' in
t
o next
commit
|
commitdiff
|
tree
2006-06-22
Jakub
Narebsk
i
g
itweb: whitesp
a
ce c
l
ea
n
up around '='
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Timo
Hir
v
onen
gitweb: U
s
e $hash_bas
e
as $search_hash
i
f
possible
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Juni
o
C Hama
n
o
Merge
branch
'
j
c
/wa
i
tpid'
commit
|
commitdiff
|
tree
2006-06-22
Junio C
H
amano
M
er
g
e branch 'ff/c99'
commit
|
commitdiff
|
tree
2006-06-22
Juni
o
C Hamano
Merge
b
r
anch 'pb/co
n
fig'
commit
|
commitdiff
|
tree
2006-06-22
Juni
o
C Hamano
Merge branch
'
lt/objli
s
t'
commit
|
commitdiff
|
tree
2006-06-22
Eric Wong
git-
s
vn: fix c
o
mmit
-
-edit flag when using SVN:: libr
a
ries
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
Ma
k
efile: d
o
no
t
forc
e
unneeded recompilation
upon
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Junio C H
a
mano
rebase --m
e
rge:
fix for rebasing more than 7 com
m
its
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Eri
c
W
.
Biede
r
man
Check and document
t
he options
t
o prev
e
nt
m
istakes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Yakov Lerne
r
Pa
s
s
-
DD
E
FAULT_
G
IT_TEMPLATE_DIR only where actuall
y
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
Merge branc
h
'master' into next
commit
|
commitdiff
|
tree
2006-06-21
Junio C Hamano
Me
r
ge bran
c
h 'jc/upload-co
r
rupt' i
n
t
o n
e
xt
commit
|
commitdiff
|
tree
2006-06-21
Ju
n
io C
H
amano
Merge branch 'jn/web' into next
commit
|
commitdiff
|
tree
2006-06-21
Junio
C
Hamano
daemon: send stder
r
to /dev/null inste
a
d of clo
s
ing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Ja
k
ub Narebski
gitweb: M
a
ke use of $P
A
TH_INFO for p
r
oject pa
r
ame
t
e
r
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Linu
s
Torv
a
lds
F
i
x grow_r
e
fs_hash()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
J
unio
C
Hama
n
o
Merge bra
n
ch
'ew/rebase
'
into next
commit
|
commitdiff
|
tree
2006-06-21
E
r
i
c
W
o
n
g
rebase: error out for NO_PYTHON if they use recur
s
ive
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Junio C
H
amano
Add ren
a
min
g
-reba
s
e test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Eric Wong
rebase: Allow merge str
a
tegies to be used when rebas
i
ng
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
A
ndre
N
oll
o
bject-refs: a
v
oid div
i
sion by
ze
r
o
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Junio C Hamano
M
erge b
r
anch 'ff/c99' into ne
x
t
commit
|
commitdiff
|
tree
2006-06-21
J
unio C
Ham
a
n
o
M
erge
branch 'j
c
/upload-corrupt' into next
commit
|
commitdiff
|
tree
2006-06-21
Ju
n
io C Hamano
upload-pack/fetc
h
-pac
k
: support side-band commu
n
ication
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
J
unio C
Haman
o
Retire git
-
clone-pack
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Junio C Hamano
upload
-
pack: prep
a
re for sideband message support
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Junio C
Hamano
uplo
a
d
-pack: avoid se
n
d
ing an
incomplete
p
a
ck upon
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Jun
i
o C
Hamano
Merg
e
branch 'jn/web'
into next
commit
|
commitdiff
|
tree
2006-06-21
Uwe Z
e
isberger
F
i
x
possible out-of-bounds array acc
e
ss
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Jakub Narebski
Move $gitbin ea
r
lie
r
in gitweb
.
c
gi
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Jakub Narebsk
i
Add git ver
s
ion to gitweb output
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Jakub Nare
b
ski
gitweb: whitespace
c
leanup
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Juni
o
C Hamano
Me
r
ge b
r
anc
h
'master' into
n
ext
commit
|
commitdiff
|
tree
2006-06-21
Ju
n
io C Hamano
checkout
-f: do
no
t
leave
u
ntr
a
ck
e
d worki
n
g tree files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
David
W
oodhouse
Log peer a
d
d
r
ess when git-d
a
emon called
from ine
t
d
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-20
J
unio C Hamano
Merge
b
ranch
'
jn/web'
into next
commit
|
commitdiff
|
tree
2006-06-20
Jakub N
a
rebski
g
itweb: styl
e
done with style
s
h
eet
commit
|
commitdiff
|
tree
2006-06-20
J
a
kub Narebski
gitweb:
A
c
ouple of
page ti
t
l
e
t
w
eakin
g
commit
|
commitdiff
|
tree
next