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
Merge branch 'jc/diff-test' into th/diff
2006-06-27
Junio C Hamano
Merge bra
n
c
h 'jc/d
i
ff-te
s
t' int
o
th/diff
commit
|
commitdiff
|
tree
2006-06-27
Timo
H
irvonen
Fix d
i
ff-
t
ree -s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-27
Ti
m
o Hirv
o
nen
l
o
g --raw: Don't descend i
n
to
subdirectories by default
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-27
T
imo H
i
r
v
o
nen
diff-tr
e
e: Use ---\n as a
m
ess
a
ge sepa
r
ator
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-27
Timo
H
irvonen
Print
e
m
p
ty lin
e
between raw,
stat, summary
and pa
t
ch
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-27
Junio C Hamano
t4013: add m
o
r
e
tests aro
u
n
d
-c and
--cc
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Timo Hirvonen
whatch
a
nged: Default to
DIFF_FORMAT_RAW
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Timo Hirvon
e
n
Don't xca
l
loc()
struct dif
f
st
a
t_t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Timo
H
i
r
vonen
A
d
d msg_
s
ep to diff
_
o
ptions
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Timo
H
irvonen
DIF
F
_
F
O
RMAT_RAW is not default
anymo
r
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Ti
m
o Hirvonen
S
e
t
d
e
f
ault
d
iff o
u
tput for
m
at
a
f
ter parsing command
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Tim
o
H
irvonen
Make --raw
option avai
l
able
f
o
r a
l
l diff
c
ommands
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Timo
Hi
r
vonen
Me
r
ge w
i
th_r
a
w, with_s
t
a
t
and summary variables
to
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Junio C Hamano
t4013: add test
s
for diff/log fami
l
y o
u
tput op
t
ions
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Jun
i
o C
Hamano
Merge br
a
n
c
h 'jc/squa
s
h'
commit
|
commitdiff
|
tree
2006-06-26
Junio C Hamano
Merge br
a
n
ch 'j
c
/diff'
commit
|
commitdiff
|
tree
2006-06-26
Junio C
H
amano
Merge branch '
m
l/cvsim
p
ort
'
commit
|
commitdiff
|
tree
2006-06-26
Junio C Hama
n
o
M
erge
b
ranc
h
'js/diff
'
commit
|
commitdiff
|
tree
2006-06-26
Junio C
Hama
n
o
Merge
branch
'
e
w
/rebase'
commit
|
commitdiff
|
tree
2006-06-26
Denni
s
S
t
osberg
Fix
p
k
t-
l
ine
.
h
to compile w
i
t
h a non-GCC
compiler
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Denn
i
s Stosberg
Solaris needs
i
nclu
s
ion
o
f signal
.
h for signal()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
M
a
tthias Lederhofer
cor
r
ect documentati
o
n fo
r
g
it grep
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
J
unio C Hamano
diff --color: use
$
GIT
_
D
IR/config
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Eric Won
g
re
b
ase: all
o
w --skip
t
o w
o
r
k w
i
t
h
-
-
merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Eric
W
ong
re
b
ase: cleanup rebasing with --merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
E
r
ic W
o
ng
reb
a
s
e: al
l
ow --
m
erge option to handle
p
atche
s
m
e
rged
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Yann Dirson
git-
c
o
m
mit
:
fil
t
er o
u
t
log mess
a
ge lines only when
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Peter Eriksen
Rename safe_strn
c
py() to s
t
rlcpy()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Joh
a
n
ne
s
Schindeli
n
apply: rep
l
ace NO_A
C
CURA
T
E_DIFF wi
t
h --i
n
accurate-eof
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Timo Hirv
o
nen
Clean up
d
iff
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Johannes
S
chindeli
n
c
v
s
import: always set $ENV{GIT_
I
NDEX_FILE} t
o
$index
.
.
.
commit
|
commitdiff
|
tree
2006-06-24
Mart
i
n Lan
g
h
o
ff
cvsimport: se
t
up
indexes correctl
y
for
ancest
o
rs an
d
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Junio C Hamano
repo-con
f
i
g: f
i
x printin
g
of
b
ool
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
J
un
i
o
C
Hamano
diff
--co
l
or: us
e
reset sequence when we mean reset
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Martin L
a
ng
h
off
git-repack -- re
s
pect -q a
n
d
be
q
u
i
et
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Ju
n
i
o C Hamano
git-merge --
s
quash
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
J
unio C Hamano
git-p
u
ll: abort when fmt-merge-
m
sg f
a
ils
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
J
unio C Hamano
Merge
br
a
nch
'pb
/
error'
commit
|
commitdiff
|
tree
2006-06-24
Ju
n
io C Ham
a
no
usage:
minimum type fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Petr Baudis
Custo
m
izable er
r
or handlers
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
T
i
mo Hirvonen
g
i
t-
m
erge: Don't u
s
e -p when outputti
n
g summary
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Johannes Schindelin
Teach di
f
f about
-b and
-
w flags
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-23
Jeff King
git-co
m
mit: allo
w
-e op
t
ion a
n
ywhere on com
m
and line
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-23
Johannes Schindelin
p
a
tch-id: ta
k
e
"
c
o
m
mit" pr
e
f
ix as well as "
d
iff-tr
e
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
M
akef
i
le:
d
o not re
c
om
p
ile main programs when librari
e
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Matthias Kestenholz
a
d
d
GIT-CFLAGS to
.
gitignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Linus
Torval
d
s
T
weak diff
c
olors
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
Merge
b
ranch 'master' into next
commit
|
commitdiff
|
tree
2006-06-22
Junio C
H
amano
M
erge branch 'js
/
lsfix'
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
Mer
g
e b
r
a
n
c
h
'ew/reb
a
se
'
commit
|
commitdiff
|
tree
2006-06-22
Jun
i
o
C
Hamano
Mer
g
e branch '
j
n/web'
commit
|
commitdiff
|
tree
2006-06-22
Juni
o
C Hamano
Mer
g
e early
p
arts of branch 'js/diff'
commit
|
commitdiff
|
tree
2006-06-22
Junio C
Hamano
Merge branch
'
j
c
/upload-co
r
r
upt'
commit
|
commitdiff
|
tree
2006-06-22
Junio C Ham
a
no
Merge branc
h
'
ew/rebase' into
n
ext
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
Merge
branc
h
'j
n
/w
e
b'
i
nto ne
x
t
commit
|
commitdiff
|
tree
2006-06-22
J
akub Na
r
ebski
git
w
eb: whites
p
a
ce cleanup around
'
='
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Timo Hirvon
e
n
gitweb: Us
e
$hash_bas
e
as
$
sear
c
h_
h
ash if possible
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Ju
n
i
o C Hamano
Me
r
ge bran
c
h 'jc/wai
t
pid'
commit
|
commitdiff
|
tree
2006-06-22
Jun
i
o C
H
a
m
ano
Merge br
a
nch 'ff/c
9
9'
commit
|
commitdiff
|
tree
2006-06-22
Ju
n
io C Hamano
M
e
rge
branch 'pb/conf
i
g'
commit
|
commitdiff
|
tree
2006-06-22
Junio C
H
amano
Merge branch 'lt/objlist'
commit
|
commitdiff
|
tree
2006-06-22
Eric
Wong
git-svn: fix commit --edit
f
lag
when using SVN:: librar
i
es
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
J
unio C Hamano
Mak
e
file: do not force unn
e
e
d
ed recomp
i
lati
o
n upo
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Junio C
H
amano
r
ebase --merge: fix
for reba
s
i
n
g mor
e
th
a
n
7 commits
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Eric W
.
Bi
e
derman
Check and docum
e
nt the opt
i
ons to prevent mistakes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Yakov Lerner
Pa
s
s -DDEFAULT_GIT_TEMPLATE_
D
IR only
w
here actually
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Junio C
H
amano
M
erge
branch 'maste
r
'
into next
commit
|
commitdiff
|
tree
2006-06-21
Junio C Hamano
Merge
br
a
nch 'jc/up
l
o
a
d-corru
p
t' into ne
x
t
commit
|
commitdiff
|
tree
2006-06-21
Junio
C H
a
ma
n
o
Merge
b
ranch 'jn/web'
i
nto next
commit
|
commitdiff
|
tree
2006-06-21
Junio
C Hamano
daemo
n
:
send
s
tde
r
r to /de
v
/nul
l
inst
e
ad of c
l
o
s
ing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Jak
u
b
Narebski
g
i
t
w
eb: Make
u
s
e of $PATH_INFO for project parameter
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Li
n
us
T
o
rval
d
s
Fix gr
o
w_refs_hash()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Junio C Hamano
Merge bra
n
ch 'e
w
/rebase' int
o
next
commit
|
commitdiff
|
tree
2006-06-21
Eric Wong
rebase: error
out
f
o
r
NO_PY
T
HON if they u
s
e
recursive
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
J
unio C Haman
o
Add renaming-reb
a
se
te
s
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Eric
W
o
ng
reba
s
e: A
l
l
ow me
r
ge st
r
ategies to be us
e
d wh
e
n rebasing
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Andre Noll
o
b
ject-refs:
avo
i
d
d
iv
i
s
ion by ze
r
o
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Junio
C
Haman
o
Merg
e
b
ranch 'ff
/
c99' into next
commit
|
commitdiff
|
tree
2006-06-21
Junio C
H
amano
Merge branch '
j
c
/
upload-corrupt' i
n
to next
commit
|
commitdiff
|
tree
2006-06-21
Junio C Hamano
upload-pack/fetch-pack: suppor
t
si
d
e-b
a
nd communication
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
J
unio C Ham
a
n
o
Re
t
ire
git-cl
o
ne-pack
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Juni
o
C
Hamano
upload-pack: p
r
epa
r
e f
o
r si
d
eband me
s
sag
e
s
u
pport
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
J
u
nio
C
Hamano
u
p
load-p
a
ck: avoid sending an inc
o
m
plete pack
u
pon
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Junio C Haman
o
Merge branch 'jn/we
b
' into
n
ext
commit
|
commitdiff
|
tree
2006-06-21
Uwe
Z
eisberger
Fix possible
out-of-bounds arra
y
a
ccess
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
J
akub Na
r
ebski
Move
$
gitbi
n
ea
r
lier in
g
itweb
.
c
g
i
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Jakub Nareb
s
k
i
A
dd git ver
s
ion
t
o gi
t
w
e
b ou
t
put
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Jakub Narebski
gitweb: whitespace cleanup
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Junio C Hama
n
o
Me
r
g
e
branch
'
m
a
ster' into
n
ext
commit
|
commitdiff
|
tree
2006-06-21
Junio
C Haman
o
checkout -f: do n
o
t leave unt
r
acked working
t
ree file
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
D
a
vid
Woodhouse
L
og peer
a
ddress
w
h
en git-daemon called from
inetd
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-20
Ju
n
io C
H
amano
M
e
r
g
e b
r
a
nch
'jn
/
web'
i
nto next
commit
|
commitdiff
|
tree
2006-06-20
Ja
k
ub Narebski
gitweb:
s
t
yle done with st
y
lesheet
commit
|
commitdiff
|
tree
2006-06-20
J
a
kub Nar
e
bs
k
i
gitweb: A couple of
p
age t
i
tle tweaking
commit
|
commitdiff
|
tree
2006-06-20
Junio C Hamano
M
e
rge branch 'jn/web
'
into next
commit
|
commitdiff
|
tree
2006-06-20
Jakub Narebski
Fix:
S
upport for
the stand
a
rd mim
e
.
types map i
n
gitweb
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-20
Junio C Hamano
Merge
bra
n
ch
'
m
a
ste
r
' into next
commit
|
commitdiff
|
tree
2006-06-20
Junio C Ha
m
ano
M
erge branch 'jn/web' int
o
next
commit
|
commitdiff
|
tree
2006-06-20
Junio C H
a
m
a
no
Merge bran
c
h 'pb/conf
i
g' into next
commit
|
commitdiff
|
tree
2006-06-20
Florian Forster
Remove all vo
i
d-pointer
ari
t
h
me
t
ic
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next