repo.or.cz
/
git
/
git-svn.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-29
J
u
nio C
H
amano
Merge branch '
j
c/
d
iff-test
'
into th/diff
commit
|
commitdiff
|
tree
2006-06-29
J
unio
C
Ha
m
ano
t4013: add
f
ormat-patch te
s
ts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-29
Junio C Hama
n
o
form
a
t-
p
atch: fix d
i
ff for
m
at o
p
t
ion implementati
o
n
commit
|
commitdiff
|
tree
2006-06-28
Junio
C H
a
mano
Merge bran
c
h 'jc/diff-tes
t
-
updates
'
into th/diff
commit
|
commitdiff
|
tree
2006-06-28
Junio C Hamano
c
o
mbine-diff
.
c: type
s
anity
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-27
Junio C
H
amano
t4013 te
s
t upd
a
tes for new ou
t
put code
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-27
Junio C Hamano
Fix so
m
e mor
e
d
i
f
f opti
o
ns changes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-27
Junio C Hamano
M
e
rge branc
h
'jc
/
diff-
t
est' into th/
d
iff
commit
|
commitdiff
|
tree
2006-06-27
Timo Hirv
o
nen
F
ix diff-tr
e
e -s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-27
Ti
m
o Hirv
o
ne
n
log --ra
w
: Don't
d
e
sc
e
nd i
n
to subdire
c
tories by defaul
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-27
Timo H
i
rvo
n
en
diff-tree:
U
se ---\
n
as a messag
e
separ
a
tor
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-27
Tim
o
H
irvonen
Print em
p
ty
l
i
n
e
between
r
aw, stat,
summ
a
r
y
a
n
d
patch
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-27
Junio C Hama
n
o
t4013: add more
t
est
s
around -c
a
nd --cc
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Timo Hirvonen
whatchanged
:
Defau
l
t to
D
IFF
_
FORMAT_RAW
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Tim
o
Hirv
o
nen
Don
'
t xcallo
c
() s
t
ruct d
i
ffstat_t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Timo Hirv
o
n
e
n
Add
msg_sep to
d
iff_options
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
T
imo Hirvon
e
n
DIFF_F
O
RMAT_
R
AW is
not default anymo
r
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Timo
H
irvonen
Set default d
i
ff output format after parsing comma
n
d
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Timo Hirvonen
Mak
e
--raw
o
ption avail
a
b
l
e for
all d
i
f
f
c
omma
n
ds
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Timo Hir
v
onen
Merge with_raw, wit
h
_stat and summary
variables to
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Junio C
Hamano
t4013
:
add
t
ests for diff/log fa
m
ily outpu
t
op
t
ions
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Junio
C
Hamano
M
erge branch 'jc/squash'
commit
|
commitdiff
|
tree
2006-06-26
Junio
C H
a
mano
Merge branch 'jc/diff
'
commit
|
commitdiff
|
tree
2006-06-26
J
unio C Haman
o
Me
r
ge branch
'
ml/cvsimport'
commit
|
commitdiff
|
tree
2006-06-26
Juni
o
C
Ha
m
ano
Merge
bra
n
ch 'j
s
/diff'
commit
|
commitdiff
|
tree
2006-06-26
Junio C H
a
mano
Merge b
r
anch 'ew/r
e
base'
commit
|
commitdiff
|
tree
2006-06-26
D
en
n
i
s
S
tosberg
Fix pk
t
-line
.
h to compile with a non-GCC compiler
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
D
ennis Stosberg
Solaris n
e
eds
inc
l
usion of sig
n
al
.
h
for s
i
gnal()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Matthias Lederhofer
c
o
rrect documentation
f
or
git gr
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/conf
i
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Eric Wong
reba
s
e: all
o
w
--skip to
work with --merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Eric Wong
rebase:
c
lea
n
up rebasing with
--merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Eric W
o
ng
r
e
base: allo
w
--m
e
rge option to ha
n
dle
p
at
c
hes
merged
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Yann Dirson
git
-
c
o
mmit: f
i
lter
o
u
t
l
og messa
g
e
l
ines
o
nly
when
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Peter Eriksen
Rename
s
afe_strncpy() t
o
strlcpy()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Joha
n
nes Schindelin
appl
y
: r
e
plac
e
NO_A
C
CURATE_DIFF
w
i
th
--inaccura
t
e-eof
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Timo Hirvo
n
en
Clean up
d
iff
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Johanne
s
Schindelin
cvsimp
o
rt: alw
a
ys
s
e
t
$ENV{GIT_INDEX_
F
ILE} to $in
d
ex
.
.
.
commit
|
commitdiff
|
tree
2006-06-24
Ma
r
tin Langho
f
f
cvsi
m
p
o
rt: setup i
n
dexes c
o
rrectly for ancestors and
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Junio C Hamano
re
p
o-
c
onfig: fix printing of bool
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Junio C Hamano
diff
-
-colo
r
: use reset sequence when we mean reset
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Martin Lan
g
hoff
git-repack
-
-
respect -q and be quiet
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
J
u
nio C Hamano
git-merge
--squash
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Junio
C
Haman
o
git-pull: abo
r
t when f
m
t-merge-msg fails
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Junio C Hamano
Merge branch 'pb/error'
commit
|
commitdiff
|
tree
2006-06-24
Junio
C Ha
m
ano
usage:
minimum
t
ype fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Petr Ba
u
dis
Custom
i
zab
l
e error handl
e
r
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
T
imo H
i
rvonen
gi
t
-merge
:
Don't use -p
when outputting summary
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Joh
a
nnes Schin
d
elin
Teach diff about -b and -
w
flags
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-23
Je
f
f
Ki
n
g
gi
t
-commit: all
o
w -
e
option any
w
here on com
m
a
n
d
line
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-23
Johanne
s
Schind
e
lin
patch
-
id: ta
k
e "com
m
it" prefix as well
as "diff-t
r
ee
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Junio C Ham
a
n
o
Makefile: do no
t
recompile
main programs whe
n
libraries
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Matthias K
e
stenhol
z
add GIT-CFLAGS
to
.
gitignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Li
n
us Torvalds
Tweak
d
iff c
o
lor
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
Merge branch 'mas
t
er'
i
nto n
e
xt
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
Merge branch
'js/lsfix
'
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
M
e
rge b
r
anch
'
e
w/rebase
'
commit
|
commitdiff
|
tree
2006-06-22
Junio
C
Hamano
M
erge
b
ranch
'
j
n/web'
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
Merge
earl
y
p
a
rts of branch 'js/diff'
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
Merge b
r
anch 'j
c
/upload-
c
orrupt'
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
M
er
g
e b
r
anch 'ew/rebase' into next
commit
|
commitdiff
|
tree
2006-06-22
Juni
o
C Hamano
Merge br
a
n
c
h 'jn/web' into
next
commit
|
commitdiff
|
tree
2006-06-22
Jakub
N
a
rebski
gitweb: w
h
itespace
c
leanup a
r
o
und
'
='
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Timo Hirvonen
g
i
t
web: Use $hash
_
b
as
e
as
$
search_has
h
if possible
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Junio
C Hamano
Merge
bra
n
ch 'jc/waitpid'
commit
|
commitdiff
|
tree
2006-06-22
J
u
nio C
Hamano
Merge br
a
nc
h
'ff
/
c99'
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
M
e
rge branc
h
'pb/config'
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
Mer
g
e branch 'lt/objlist'
commit
|
commitdiff
|
tree
2006-06-22
Er
i
c W
o
ng
git-svn: fi
x
commit
-
-
edit f
l
ag w
h
en
u
sing SVN:: libraries
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Junio C H
a
mano
Makefile: do
not force unneeded r
e
c
o
mpilation up
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
re
b
ase
-
-merge: fix for re
b
asing more than 7 commits
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Eric
W
.
Biederman
C
h
eck
a
nd
docume
n
t the options to prevent mistakes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Yakov Lerner
Pass -DD
E
FAU
L
T_GIT_T
E
MPLATE_D
I
R
only
wher
e
actually
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Junio
C
Hama
n
o
Merge branch '
m
aster' into
n
ext
commit
|
commitdiff
|
tree
2006-06-21
Junio
C
Hamano
Merg
e
bra
n
ch 'jc/upload-corrupt' int
o
next
commit
|
commitdiff
|
tree
2006-06-21
Juni
o
C
H
ama
n
o
Merge branch 'jn/web
'
i
n
to nex
t
commit
|
commitdiff
|
tree
2006-06-21
Junio C Hamano
daemo
n
: send stderr to
/
d
e
v/null
i
n
stead
o
f clo
s
ing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Jakub Nare
b
ski
gitweb:
Make
use
o
f $PATH_INFO
for project parameter
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Linus Torv
a
lds
Fix grow_refs_ha
s
h()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Junio C Hamano
Merge branc
h
'ew/re
b
ase' into next
commit
|
commitdiff
|
tree
2006-06-21
Eric W
o
ng
re
b
a
s
e: error out f
o
r
NO_PYTHON if they
u
se
recursive
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
J
u
nio C Hamano
Add rena
m
ing-r
e
base test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Eric Wong
reba
s
e: Allow merge strat
e
gies
t
o be used w
h
en r
e
b
a
sing
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Andre Noll
o
b
ject-refs: avoid division
by
z
e
r
o
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Junio
C H
a
m
a
no
Mer
g
e br
a
nch 'ff/c99' into next
commit
|
commitdiff
|
tree
2006-06-21
Junio
C
H
amano
Merge branch 'j
c
/u
p
l
oad-c
o
rrup
t
' into next
commit
|
commitdiff
|
tree
2006-06-21
Juni
o
C Ha
m
ano
upload
-
p
a
ck/fetch-pack: supp
o
r
t
si
d
e-band communication
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Junio C Ham
a
no
Reti
r
e
git-c
l
one-pack
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Junio C
H
amano
uplo
a
d-pack: prepar
e
for
s
ideb
a
nd m
e
ssage support
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Junio C
Hamano
upload-p
a
ck: av
o
id s
e
nd
i
ng an
incomplet
e
pack up
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Junio
C Ha
m
ano
Me
r
g
e branch
'
jn/web' into next
commit
|
commitdiff
|
tree
2006-06-21
Uwe Zeisbe
r
ger
Fix
p
os
s
i
ble out-of-
b
o
unds array ac
c
ess
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Jakub Narebski
Move
$
g
i
t
bin earlier in gitweb
.
cgi
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Jaku
b
Narebski
Add g
i
t version to
g
itweb output
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Jakub Narebski
gitweb: w
h
itespace c
l
eanup
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Junio C Hamano
M
erge
b
r
a
nch 'master' int
o
next
commit
|
commitdiff
|
tree
2006-06-21
Junio C Haman
o
checkout -
f
:
do
not l
e
a
ve
untracked working tree
f
i
l
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
David W
o
odhous
e
L
og peer add
r
ess
w
hen git-daemon
cal
l
e
d from
i
netd
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-20
Junio C H
a
mano
Merge bran
c
h
'jn/
w
eb'
into next
commit
|
commitdiff
|
tree
2006-06-20
Jakub Narebski
g
it
w
eb: sty
l
e
done
w
i
t
h stylesh
e
et
commit
|
commitdiff
|
tree
next