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-updates' into th/diff
2006-06-29
J
u
nio C Hamano
Merge
b
ranc
h
'
j
c
/diff-t
e
st-upd
a
te
s
' into th/diff
commit
|
commitdiff
|
tree
2006-06-29
Junio C Hamano
t4013: note
improve
m
ents brought by the new
o
utput
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-29
Juni
o
C Hamano
M
erge branch 'jc/diff
-
test' into jc/diff-
t
est-updates
commit
|
commitdiff
|
tree
2006-06-29
Junio C H
a
m
a
n
o
Merge branch 'jc/diff-t
e
s
t
' into th/diff
commit
|
commitdiff
|
tree
2006-06-29
Junio C Hamano
t
4013: add forma
t
-p
a
tch
t
e
s
ts
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-29
Junio
C Hamano
format-patch: fix diff format option imple
m
entatio
n
commit
|
commitdiff
|
tree
2006-06-28
J
u
nio C Hamano
Mer
g
e
b
ra
n
ch 'jc/dif
f
-test-u
p
da
t
es'
i
n
t
o
t
h/dif
f
commit
|
commitdiff
|
tree
2006-06-28
Junio C Hamano
combi
n
e
-
diff
.
c:
ty
p
e sanity
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-27
Juni
o
C Hamano
t40
1
3
test updat
e
s for new
output code
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-27
J
unio C
H
am
a
no
Fix some more
diff option
s
cha
n
ge
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-27
Junio C Hamano
Merge branch 'jc/dif
f
-test
'
i
nt
o
th/diff
commit
|
commitdiff
|
tree
2006-06-27
T
i
mo
H
irvonen
Fix diff-
t
ree -
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-27
Timo Hirvonen
log
-
-raw: Don
'
t descend int
o
subdi
r
ectories by default
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-27
Timo Hi
r
v
on
e
n
diff-tr
e
e: Use ---\n
a
s a message separat
o
r
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-27
Ti
m
o
H
i
r
v
onen
Pri
n
t empty li
n
e b
e
tween raw
,
s
t
a
t
,
s
u
mm
a
ry and patch
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-27
Ju
n
i
o
C
Hamano
t4013: ad
d
more tests aroun
d
-c a
n
d --c
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-26
Timo Hirvonen
wha
t
c
h
anged: Default
t
o DIFF_FOR
M
AT_
R
AW
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-26
Timo H
i
rvone
n
D
on'
t
xcalloc() str
u
ct di
f
fstat_t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-26
Timo Hirvonen
Add msg_sep to d
i
ff
_
o
p
tions
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-26
T
i
mo Hirv
o
nen
DIFF
_
FORMA
T
_R
A
W
is not default anymore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-26
Timo H
i
rvo
n
en
S
e
t d
e
f
a
ult dif
f
output forma
t
after parsing
c
ommand
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-26
Timo Hirvonen
Make
--raw o
p
ti
o
n availab
l
e
for a
l
l
d
i
ff commands
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-26
Timo
Hirvo
n
en
Merge
w
i
th
_
raw, with_stat and summary v
a
r
iables to
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-26
J
u
nio C Haman
o
t4
0
13: add tests for diff/l
o
g famil
y
outp
u
t options
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-26
Jun
i
o
C Hamano
Me
r
g
e
branc
h
'jc
/
s
quash'
commit
|
commitdiff
|
tree
2006-06-26
Junio C Hama
n
o
Me
r
ge bran
c
h '
j
c
/dif
f
'
commit
|
commitdiff
|
tree
2006-06-26
Junio C Ham
a
n
o
Merge branch 'ml/cvsim
p
ort'
commit
|
commitdiff
|
tree
2006-06-26
Jun
i
o C Hamano
M
erge br
a
nch 'js
/
diff'
commit
|
commitdiff
|
tree
2006-06-26
Junio C Hamano
Merge bran
c
h
'ew/reba
s
e
'
commit
|
commitdiff
|
tree
2006-06-26
Dennis St
o
sberg
F
i
x
pkt-li
n
e
.
h to compile wit
h
a non-G
C
C
comp
i
l
e
r
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-26
D
e
nnis St
o
s
b
er
g
Sola
r
is ne
e
ds inclusion
of signal
.
h for signal()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-25
Matthias L
e
derhofer
c
orrect doc
u
mentation
f
o
r
g
it g
r
ep
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-25
Junio C Hamano
d
iff
--color: us
e
$GIT_DIR/confi
g
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-25
Eric Wong
reb
a
se: allo
w
--skip to w
o
r
k
with --merge
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-25
Eric
Wo
n
g
rebas
e
: cle
a
nup
r
ebasing wi
t
h --merge
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-25
Eric Wong
r
e
b
a
se:
a
llow --merge optio
n
to
h
and
l
e
pa
t
ches merged
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-25
Y
a
n
n Dirson
git-commit: filter out
l
og message lines onl
y
when
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-25
Peter
E
ri
k
sen
Re
n
ame safe_
s
t
rncpy() to strlcpy()
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-25
J
ohannes
S
chindelin
apply:
replace NO_ACCURATE
_
DIFF
w
ith --inaccura
t
e-eof
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-25
T
i
m
o Hir
v
onen
C
l
ean up diff
.
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-25
Johannes Schindelin
c
v
simport: always se
t
$ENV{GIT_INDEX
_
FILE} to $index
.
.
.
commit
|
commitdiff
|
tree
2006-06-24
Martin Lang
h
off
cvsim
p
o
r
t
: setup index
e
s correct
l
y for anc
e
stors and
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-24
Junio C Hama
n
o
r
epo-config
:
fix printing of
bool
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-24
Junio C Hamano
d
if
f
--color: use
re
s
et sequence when we mean reset
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-24
Martin Langhoff
git-rep
a
ck
-
-
respect -q and be qu
i
et
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-24
Junio C H
a
mano
g
it-merge --s
q
uash
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-24
Junio C H
a
mano
git-pull: ab
o
rt
whe
n
f
m
t-m
e
rge
-
msg fails
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-24
J
u
nio C Hamano
Merge branch 'pb/error'
commit
|
commitdiff
|
tree
2006-06-24
Juni
o
C
H
a
m
a
n
o
usag
e
: min
i
mum
type fi
x
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-24
Petr Ba
u
dis
C
u
stom
i
zable e
r
ror h
a
ndlers
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-24
T
imo Hirvonen
git-m
e
rge: Don'
t
use -p when
o
utputting su
m
m
ary
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-24
Johannes Schindelin
Teach diff
ab
o
u
t
-b and -w f
l
ags
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-23
Jeff Ki
n
g
git-commit: allow -e o
p
t
i
on anywhere on
c
ommand lin
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-23
J
o
h
annes
S
chi
n
deli
n
pa
t
ch-id: tak
e
"commit" prefix
a
s well as "dif
f
-tree
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-22
Junio C Ham
a
no
M
akefi
l
e: do not reco
m
pi
l
e
main programs when libraries
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-22
Matt
h
ias
K
estenholz
a
dd GIT-CFLAGS to
.
g
i
tignore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-22
L
i
nus Torval
d
s
Twea
k
dif
f
col
o
rs
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-22
J
u
nio C Hamano
Merg
e
branc
h
'master' into next
commit
|
commitdiff
|
tree
2006-06-22
Jun
i
o
C H
a
mano
M
erge bra
n
ch '
j
s/lsfix'
commit
|
commitdiff
|
tree
2006-06-22
Jun
i
o C H
a
mano
Merge branch 'ew/rebase'
commit
|
commitdiff
|
tree
2006-06-22
J
un
i
o C Hamano
Merge bran
c
h
'jn
/
web
'
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
Merge e
a
rl
y
parts of branch 'js/diff'
commit
|
commitdiff
|
tree
2006-06-22
Junio C
H
am
a
n
o
Merge branch 'jc
/
upload-corrupt'
commit
|
commitdiff
|
tree
2006-06-22
Junio C Ha
m
ano
Merge
b
ranc
h
'ew/r
e
base'
into next
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
M
e
r
g
e branch 'jn
/
web' into
next
commit
|
commitdiff
|
tree
2006-06-22
Jakub Narebski
gitweb: w
h
itespace cleanup
a
round '='
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-22
Timo Hirvonen
gitweb: U
s
e $hash_base as $sea
r
c
h_hash
i
f possible
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-22
Junio C Ham
a
no
Merge branch
'
j
c/wa
i
tpid'
commit
|
commitdiff
|
tree
2006-06-22
Junio C
H
am
a
no
Merge
bran
c
h
'
ff/
c
99'
commit
|
commitdiff
|
tree
2006-06-22
Junio
C
H
amano
Merge branch 'pb/config'
commit
|
commitdiff
|
tree
2006-06-22
Jun
i
o C
H
a
mano
Merge bra
n
ch 'lt/objlist'
commit
|
commitdiff
|
tree
2006-06-22
Eric Wong
g
i
t-sv
n
: fix commit --edit fl
a
g whe
n
using SVN::
l
ibraries
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-22
J
u
n
io C Hamano
Makefile:
d
o
not force u
n
needed
recompilation upon
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-22
J
u
nio C
Hama
n
o
reba
s
e -
-
mer
g
e:
f
ix
for reb
a
sing m
o
re
tha
n
7 c
o
mmits
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-22
Eric
W
.
Biederman
Check and
d
o
cument the options t
o
preven
t
mistakes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-22
Yakov Lern
e
r
P
as
s
-DDEFAULT_
G
IT_TE
M
PLATE_DIR only where ac
t
ually
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-22
Junio C
H
amano
Merge branch
'master' i
n
to
n
ext
commit
|
commitdiff
|
tree
2006-06-21
J
u
nio C
Haman
o
Merge
branch '
j
c/upload-c
o
rrupt
'
into next
commit
|
commitdiff
|
tree
2006-06-21
Junio C Ham
a
no
M
e
rge branch 'jn/web
'
into next
commit
|
commitdiff
|
tree
2006-06-21
Junio C Hamano
daemon: sen
d
stderr to /dev/null instead
o
f
closing
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-21
Jakub
N
areb
s
k
i
gi
t
web: Make use o
f
$PATH_INFO
for project p
a
ra
m
eter
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-21
Linus Torval
d
s
Fi
x
gro
w
_refs_hash()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-21
J
unio C Hamano
Merge branch 'e
w
/reba
s
e' into next
commit
|
commitdiff
|
tree
2006-06-21
E
ric
Wong
rebase: error out for NO_PYTHON if they use re
c
ursive
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-21
Junio C Hamano
Add renaming-rebase test
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-21
Eric Wong
re
b
ase: Allow merge strateg
i
es to
b
e used when re
b
asing
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-21
And
r
e Noll
object-refs: avoid division
by zero
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-21
Junio C Hamano
Merg
e
branch 'ff/c99
'
in
t
o next
commit
|
commitdiff
|
tree
2006-06-21
Junio C Hama
n
o
Merge branch '
j
c/
u
pl
o
a
d-corrupt'
i
n
to n
e
xt
commit
|
commitdiff
|
tree
2006-06-21
Junio C Haman
o
upload-pack
/
f
etch-pack: support side-
b
and communi
c
ation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-21
J
unio
C
H
aman
o
Retire git-clone-pack
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-21
Junio
C H
a
mano
upload-pack
:
p
repa
r
e f
o
r side
b
and message support
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-21
Junio C Hamano
upl
o
ad
-
pack: avoi
d
sen
d
ing a
n
incomple
t
e
p
a
ck upon
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-21
Junio C Hamano
Merge branch 'jn/web' into next
commit
|
commitdiff
|
tree
2006-06-21
U
w
e
Z
ei
s
berger
F
i
x po
s
sib
l
e
out-of-boun
d
s ar
r
ay a
c
cess
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-21
J
a
kub
N
arebs
k
i
Mov
e
$git
b
i
n
ear
l
ier in gi
t
web
.
cgi
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-21
Jak
u
b
Narebsk
i
A
dd git version to gi
t
w
eb output
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-21
Jakub Nareb
s
ki
gitweb: whi
t
espace cleanup
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-21
J
u
nio C
H
amano
Merge branch 'master' into next
commit
|
commitdiff
|
tree
2006-06-21
Junio
C H
a
man
o
checkout -f: do
n
o
t
l
e
a
ve untracked
working
t
ree files
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next