repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jc/diff-test' into jc/diff-test-updates
2006-06-29
Junio C Hamano
Mer
g
e bran
c
h 'j
c
/di
f
f-test' in
t
o jc/diff
-
test-u
p
d
ates
commit
|
commitdiff
|
tree
2006-06-29
Junio C
Hamano
t4013: add format-
p
atch tests
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-27
J
u
nio C Hamano
t4
0
13
t
est upda
t
es for new output code
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-27
Junio C Ham
a
no
t4013: add more t
e
sts
a
r
o
und -c
a
nd --cc
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
J
unio C
Hama
n
o
t4
0
13
:
ad
d
tests for
d
iff/
l
og family output o
p
t
i
ons
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Junio C Ham
a
no
Merge branch 'jc/squash'
commit
|
commitdiff
|
tree
2006-06-26
J
unio C H
a
m
a
n
o
Merge branch 'jc/diff'
commit
|
commitdiff
|
tree
2006-06-26
Junio
C
H
a
m
ano
Merge br
a
nch 'ml/cvs
i
mport'
commit
|
commitdiff
|
tree
2006-06-26
J
unio C Hama
n
o
Merge branch 'js/diff'
commit
|
commitdiff
|
tree
2006-06-26
Junio C H
a
man
o
Merge branc
h
'ew/rebase'
commit
|
commitdiff
|
tree
2006-06-26
Denn
i
s Stosberg
Fix pkt-l
i
ne
.
h
t
o compile
w
ith a
non
-
GCC compiler
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
D
e
n
n
is Stosberg
Solaris needs inclusion of signal
.
h
for sig
n
a
l
(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Matthias Led
e
rhofer
correct documentation for
g
it
g
r
e
p
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Juni
o
C Hamano
diff --color: use $GIT_DIR/co
n
fig
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Eric
W
ong
rebase: all
o
w --ski
p
to wor
k
with --merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
E
r
ic Wong
re
b
ase:
c
le
a
nup r
e
basing with --merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Eric Wong
r
e
base: allow --merge opti
o
n to handle p
a
tc
h
es merged
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Ya
n
n Dirson
g
i
t-
c
ommi
t
:
filter out log
m
essage lines only when
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Peter Eriksen
Rename safe_strncpy() t
o
strlcpy()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Johannes S
c
hindel
i
n
apply:
repl
a
ce NO_ACCURAT
E
_DIFF with --inaccura
t
e
-
eof
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Timo
H
irvonen
Clean up diff
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Joh
a
nnes Sch
i
nde
l
in
c
vsi
m
p
ort: always
set $ENV{GIT_INDEX_F
I
LE} to $i
n
d
ex
.
.
.
commit
|
commitdiff
|
tree
2006-06-24
Martin Langhoff
cvsi
m
port: setup
i
ndex
e
s correct
l
y for ancestors and
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Junio C Hamano
r
e
po-co
n
f
ig: fix printing of
b
ool
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
J
u
n
i
o
C H
a
m
ano
d
i
ff --color:
use
reset seq
u
ence when we mean re
s
et
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Ma
r
tin Langhoff
git-repack -- respe
c
t -q and be quiet
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Junio C
H
amano
git-merge --
s
q
u
ash
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Junio C Hamano
git-pull: a
b
ort when f
m
t-merg
e
-ms
g
fails
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Junio C Ha
m
ano
M
e
rge branch 'p
b
/error'
commit
|
commitdiff
|
tree
2006-06-24
Juni
o
C
Hamano
usage:
m
i
nimum type fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Petr B
a
udis
Cu
s
tomi
z
able error hand
l
e
r
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Timo Hirvonen
git-mer
g
e: Don't use -p when
ou
t
putting su
m
m
ary
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Joh
a
nnes Schi
n
delin
Teach diff about -b and
-w flags
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-23
J
eff King
git-co
m
mit: all
o
w
-e option any
w
here on command
line
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-23
Johannes Sc
h
indelin
patc
h
-id: take "com
m
i
t
"
pre
f
i
x as w
e
ll as "diff-tree
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Junio C H
a
mano
Makefi
l
e: do not recompile main pr
o
grams wh
e
n
libraries
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Matthias Kes
t
enh
o
lz
a
d
d GI
T
-
CFLAGS t
o
.
git
i
gnore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Linus Torva
l
ds
Tweak diff colors
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Junio C Ha
m
ano
M
e
rge
b
ranch 'master' into next
commit
|
commitdiff
|
tree
2006-06-22
Junio C Haman
o
M
er
g
e branc
h
'js/lsfix
'
commit
|
commitdiff
|
tree
2006-06-22
J
u
n
io C Hama
n
o
Mer
g
e
bran
c
h 'ew/rebase'
commit
|
commitdiff
|
tree
2006-06-22
J
unio C Ha
m
ano
M
erge branch 'jn/web'
commit
|
commitdiff
|
tree
2006-06-22
Junio
C Hamano
Merge early p
a
rts of branch 'js/diff'
commit
|
commitdiff
|
tree
2006-06-22
J
un
i
o C Haman
o
Merge branch
'
j
c
/upload-corrupt'
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
M
e
r
g
e bra
n
c
h
'
e
w
/rebase' into next
commit
|
commitdiff
|
tree
2006-06-22
J
unio
C
Hamano
Merge branch 'jn/web'
into
next
commit
|
commitdiff
|
tree
2006-06-22
Jakub Narebski
gitw
e
b: whitespace
cleanup around '='
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Tim
o
Hir
v
one
n
gitweb: Use $hash_base as $search_ha
s
h
if possible
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
J
u
nio C
Hamano
Merg
e
b
ranch 'jc/waitpid'
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
Merge branch 'f
f
/c99'
commit
|
commitdiff
|
tree
2006-06-22
Junio C
H
amano
Merge branch 'pb/con
f
ig'
commit
|
commitdiff
|
tree
2006-06-22
Junio C Ham
a
no
Merge
branch 'lt/
o
bjlist'
commit
|
commitdiff
|
tree
2006-06-22
E
r
ic Wong
git
-
sv
n
:
fix
c
ommit
--edit
f
l
ag when using SVN:: libr
a
r
i
e
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
Makefile: do not force u
n
needed recomp
i
lation upon
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
re
b
ase --merge: fix for r
e
basin
g
more than 7
c
o
mmits
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Eric W
.
Biede
r
man
Check
and do
c
ume
n
t the o
p
t
i
on
s
to
p
reven
t
mi
s
take
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Yakov Lerner
P
a
ss -DDEFA
U
L
T
_G
I
T_
T
E
M
PLATE_DIR o
n
ly where actua
l
l
y
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
J
u
nio C Hamano
Merge branch
'
m
a
ster'
i
nto next
commit
|
commitdiff
|
tree
2006-06-21
Juni
o
C Hamano
Merge branch 'j
c
/upl
o
ad-corrupt' into n
e
xt
commit
|
commitdiff
|
tree
2006-06-21
Junio C Hamano
Merge branch
'j
n
/web' i
n
to
n
ext
commit
|
commitdiff
|
tree
2006-06-21
J
u
nio C
Hamano
daemo
n
: sen
d
stderr
t
o /dev
/
null instea
d
of closing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Jakub Narebski
gitweb: Make use o
f
$PATH_INFO for proje
c
t parameter
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Linus
Torvalds
Fix grow_refs_hash(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Junio C Hamano
Merge bran
c
h
'
ew/rebase' into next
commit
|
commitdiff
|
tree
2006-06-21
Eric Wo
n
g
rebas
e
:
error out fo
r
NO_PY
T
HON if t
h
ey use
r
ecur
s
i
v
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Junio C Ham
a
n
o
Add
r
en
a
ming
-
rebase test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
E
ric Wong
re
b
ase: A
l
low merge strategies to be
used
w
hen
reb
a
sing
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Andre Noll
obj
e
ct-
r
efs: avoid
division by zero
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Junio
C
Hamano
Merge branch 'ff/c99' into next
commit
|
commitdiff
|
tree
2006-06-21
Junio C Hamano
M
e
r
ge branch 'jc/upl
o
ad
-
corrupt' into next
commit
|
commitdiff
|
tree
2006-06-21
J
unio C Hamano
u
pl
o
ad-pa
c
k/fetch-p
a
ck: s
u
pport s
i
de-b
a
nd
c
ommunic
a
tion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Junio C Ham
a
no
R
e
tire g
i
t-clone-pac
k
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Junio
C Ha
m
ano
upload-pack
:
prepare f
o
r sideb
a
n
d
mes
s
age s
u
pport
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
J
unio C
Hamano
upload-pa
c
k
: avoid sending an incomp
l
ete pack upon
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Junio
C
Hamano
Merge branch 'jn
/
web' in
t
o next
commit
|
commitdiff
|
tree
2006-06-21
Uwe
Z
eisberger
Fix po
s
sible out
-
of-bound
s
array a
c
cess
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Jak
u
b Narebsk
i
Move $gitbin earl
i
er
i
n gitw
e
b
.
cgi
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Ja
k
ub Nare
b
sk
i
A
d
d git version to gitweb
o
utput
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Jakub Narebski
gitweb: whi
t
e
s
p
a
ce cleanup
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
J
unio C Ha
m
an
o
Merge
b
ranch 'master' into ne
x
t
commit
|
commitdiff
|
tree
2006-06-21
Junio C Haman
o
checkout -
f
:
do not l
e
ave unt
r
a
c
ked
work
i
ng
tr
e
e files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
David Woodhouse
Log peer add
r
ess when git-
d
aemon cal
l
ed f
r
om inetd
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-20
Junio C H
a
mano
Mer
g
e branch 'jn/
w
eb' into next
commit
|
commitdiff
|
tree
2006-06-20
Jakub Narebski
git
w
e
b: style done with stylesheet
commit
|
commitdiff
|
tree
2006-06-20
Jakub Na
r
ebski
gitweb: A c
o
u
ple of page title tweaking
commit
|
commitdiff
|
tree
2006-06-20
Ju
n
io C Ha
m
ano
Merge bra
n
ch 'jn/web' i
n
to next
commit
|
commitdiff
|
tree
2006-06-20
Jakub Nar
e
bski
Fix: Support for the
s
tandard mime
.
types map
in gitweb
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-20
Junio C Haman
o
Merge branc
h
'maste
r
'
i
nt
o
n
e
x
t
commit
|
commitdiff
|
tree
2006-06-20
Juni
o
C Ham
a
no
Merge b
r
anch
'
j
n/web'
into n
e
xt
commit
|
commitdiff
|
tree
2006-06-20
J
u
nio C Hamano
Mer
g
e br
a
nch 'p
b
/con
f
ig' into n
e
xt
commit
|
commitdiff
|
tree
2006-06-20
Florian Forster
Remov
e
a
l
l void
-
pointer arit
h
metic
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-20
E
r
ic Wong
gi
t
-s
v
n: f
i
x --rmdir whe
n
u
sing SV
N
::
l
ibraries
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-20
Johan
n
e
s Schindelin
git_config: access()
r
e
turns 0 on success, not > 0
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-20
Johannes Schindelin
rep
o
-
c
onfig: Fix late-n
i
ght bug
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-20
Jakub Narebski
g
itweb: add
type="text/css" to st
y
lesheet link
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-20
Junio C H
a
mano
Me
r
g
e
b
r
a
n
c
h 'jc/waitpid'
i
nto next
commit
|
commitdiff
|
tree
2006-06-20
Jun
i
o C Hamano
Merge branch 'lt/objlist' into next
commit
|
commitdiff
|
tree
2006-06-20
J
u
nio C
Ha
m
ano
Merge
b
r
a
nches '
j
s/lsfi
x
', 'pb/config' and 'jn/web
.
.
.
commit
|
commitdiff
|
tree
2006-06-20
L
i
n
us Torvalds
A
d
d
"
n
a
m
ed object ar
r
ay" concept
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-20
Junio C Hamano
Rest
o
re SIGC
H
LD t
o
SIG_
D
FL where
w
e
c
a
re about
wai
t
pid()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next