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
Junio C Hamano
Me
r
ge branc
h
'
j
c/dif
f
-
te
s
t-updates' into
th/
d
iff
commit
|
commitdiff
|
tree
2006-06-29
Junio C Hamano
t4013: note
imp
r
ov
e
ments broug
h
t
b
y
t
he
new output
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-29
J
u
n
i
o C Hamano
Me
r
ge branch 'jc/diff-tes
t
'
into jc/diff-te
s
t-updates
commit
|
commitdiff
|
tree
2006-06-29
Junio C Hamano
Merge b
r
anch 'jc/diff-tes
t
'
into
th
/
diff
commit
|
commitdiff
|
tree
2006-06-29
J
u
nio C Hamano
t4013: add for
m
at-patch tests
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-29
Junio C Hamano
forma
t
-patch: fix di
f
f form
a
t option im
p
lementation
commit
|
commitdiff
|
tree
2006-06-28
Junio C
H
amano
Merge branch
'
jc/diff-t
e
st-updates' into th/diff
commit
|
commitdiff
|
tree
2006-06-28
Ju
n
io C Haman
o
combine-diff
.
c
:
t
ype sani
t
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-27
Juni
o
C Hamano
t4
0
13 tes
t
updates for new
o
utput c
o
de
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-27
Junio C Ha
m
a
no
Fix s
o
m
e
more diff
o
ptions c
h
a
n
ges
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-27
Ju
n
io C
Ha
m
ano
Me
r
ge branch 'jc/diff-tes
t
' i
n
to th
/
diff
commit
|
commitdiff
|
tree
2006-06-27
Timo Hirv
o
n
e
n
Fix diff-tree -s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-27
Tim
o
Hirvon
e
n
log --raw: Don't
d
escend
into subdir
e
ctories by def
a
ult
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-27
Timo Hi
r
v
o
n
e
n
diff-tree: U
s
e ---\n as a message separator
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-27
T
i
mo Hirvonen
Prin
t
e
mpty line b
e
t
ween raw, stat, s
u
mmary and patc
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-27
Junio
C
Hamano
t4013: a
d
d more tests around -c
a
nd
--cc
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Timo
H
irvonen
w
hatch
a
ng
e
d: Defaul
t
to
D
IFF_FORMAT_RAW
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Timo Hirvonen
D
o
n't xcal
l
oc() struct dif
f
stat_t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Timo
H
irvonen
Add msg_sep
to diff_opt
i
ons
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Ti
m
o Hirvone
n
DIFF_FORMAT_RA
W
is not default anymore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Timo
H
irvonen
Set default di
f
f output for
m
at after parsing command
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Timo Hirv
o
n
e
n
Make
-
-r
a
w
option available
for a
l
l diff commands
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Timo Hi
r
vo
n
e
n
Merge
w
i
th_raw,
w
ith_stat and summary
v
ariables to
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
J
u
nio C
Hamano
t
4013: a
d
d tests f
o
r di
f
f/log family out
p
ut options
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Juni
o
C
H
amano
Me
r
ge branch 'jc/squash'
commit
|
commitdiff
|
tree
2006-06-26
Junio C Hamano
Merge branch 'jc/di
f
f'
commit
|
commitdiff
|
tree
2006-06-26
Jun
i
o C Ham
a
no
Me
r
ge branch
'
ml/cvsimport'
commit
|
commitdiff
|
tree
2006-06-26
Junio C
Hamano
Merge branch '
j
s/diff'
commit
|
commitdiff
|
tree
2006-06-26
Junio C
H
amano
M
e
rge branc
h
'ew/rebase'
commit
|
commitdiff
|
tree
2006-06-26
Dennis Stosberg
Fix
p
kt-line
.
h t
o
compile with a
n
on-GCC compiler
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Dennis Stosberg
S
olaris needs inclusion of signal
.
h for
signal()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Matthias Lederhofer
correct documentation for
gi
t
grep
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
J
unio C Hamano
diff -
-
color: u
s
e $
G
IT_DIR/co
n
fig
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Eri
c
Wong
rebase: all
o
w --skip to wor
k
with --
m
e
r
ge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
E
ric
W
o
ng
r
e
base: cle
a
nup rebasing wi
t
h --merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Er
i
c Wong
rebase: allow --merge option
to
han
d
le
p
atc
h
es
m
erged
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Y
a
nn Dirson
git-com
m
it: filter out log mes
s
age
lines only when
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
P
e
ter Eriksen
Re
n
ame
safe_strncpy() to strlcpy()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Johannes Schindelin
appl
y
: replace N
O
_ACCURATE_DIFF wi
t
h -
-
inacc
u
r
ate-eof
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Timo Hirvonen
Clean u
p
diff
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
J
ohannes Schindelin
cvsimport: al
w
ays set $
E
NV{GIT_INDEX_F
I
L
E
} to $index
.
.
.
commit
|
commitdiff
|
tree
2006-06-24
Martin Langhoff
cvsimpor
t
: setup ind
e
xes corre
c
tly for an
c
estors
a
nd
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Jun
i
o C Hamano
repo-c
o
nfig: fix printing of bool
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Junio C
H
a
m
ano
dif
f
--colo
r
: use res
e
t sequence when we mean re
s
et
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Martin Lan
g
hoff
g
it-repa
c
k --
respect
-
q and be
qui
e
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Junio C Hamano
git-merge --squash
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Junio C Hama
n
o
g
it-
p
ull: abort
when fmt-merge-msg fails
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Junio C Hamano
Me
r
ge
b
ranch 'pb/er
r
o
r'
commit
|
commitdiff
|
tree
2006-06-24
Junio
C
Hamano
usage
:
mini
m
um ty
p
e
fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Petr
B
audis
Cu
s
t
omiz
a
b
le error handler
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Timo Hirvone
n
git-
m
erge:
Don't use -p when outp
u
tt
i
ng
s
ummary
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Johannes Schindelin
Teac
h
diff abo
u
t -b and -w fl
a
gs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-23
Jeff King
git-commit: allow
-e
o
ption anywhere on co
m
mand line
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-23
Johanne
s
Schi
n
delin
patch-id: ta
k
e "commit"
p
r
e
fix as well
a
s
"dif
f
-tree
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Junio
C
H
a
m
ano
M
a
kefile: do not reco
m
pi
l
e main progra
m
s whe
n
lib
r
ari
e
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Ma
t
thia
s
Kestenholz
add GIT-CFLAGS to
.
gitig
n
ore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Linus Torvald
s
Tweak diff col
o
rs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Juni
o
C Hamano
M
e
rge branch 'm
a
ster' into
n
ext
commit
|
commitdiff
|
tree
2006-06-22
Ju
n
i
o C H
a
mano
Merge branch 'js/lsfix'
commit
|
commitdiff
|
tree
2006-06-22
Junio C Ha
m
ano
Merg
e
b
r
anch '
e
w/
r
ebase'
commit
|
commitdiff
|
tree
2006-06-22
Junio
C
Ham
a
no
M
erge bra
n
ch 'jn/
w
eb'
commit
|
commitdiff
|
tree
2006-06-22
Junio
C
Hamano
Merge
e
a
r
l
y
p
a
r
ts
of bra
n
ch 'js/d
i
ff'
commit
|
commitdiff
|
tree
2006-06-22
Jun
i
o C Ham
a
n
o
Merge b
r
anch
'jc/u
p
load-
c
orrupt'
commit
|
commitdiff
|
tree
2006-06-22
J
u
nio
C
H
a
mano
Merge branch 'ew/r
e
base' into n
e
x
t
commit
|
commitdiff
|
tree
2006-06-22
Junio C Ha
m
ano
Merge bra
n
ch
'
j
n
/
web'
i
n
t
o next
commit
|
commitdiff
|
tree
2006-06-22
Jakub Narebski
gitweb
:
whi
t
espace cleanup a
r
ound
'='
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Ti
m
o
H
i
rvonen
gitw
e
b: Us
e
$h
a
sh_ba
s
e
as $se
a
rch
_
hash if
p
ossible
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Ju
n
io C Hamano
Merge branch '
j
c/waitpid'
commit
|
commitdiff
|
tree
2006-06-22
J
u
n
i
o C
H
a
m
ano
Merge branc
h
'ff/c99'
commit
|
commitdiff
|
tree
2006-06-22
J
u
nio C Hama
n
o
M
e
r
g
e branch 'pb/config'
commit
|
commitdiff
|
tree
2006-06-22
J
unio C Hama
n
o
Merg
e
b
r
anch 'lt/objlis
t
'
commit
|
commitdiff
|
tree
2006-06-22
Eric
W
o
ng
git
-
svn
:
fix com
m
it --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 Hama
n
o
Make
f
ile: do not force u
n
need
e
d
r
ecom
p
i
lation
upon
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Junio C H
a
mano
rebase --merge:
f
ix for rebas
i
ng more th
a
n 7
c
ommits
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Eric W
.
B
ie
d
er
m
an
Ch
e
ck and d
o
cum
e
nt
t
he o
p
t
ions to prevent mist
a
kes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Y
ako
v
Lerner
Pass
-
DDE
F
AULT_GIT_TEMPLATE_DIR
only whe
r
e actually
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Ju
n
io C Hamano
M
e
rge branch
'
master' into next
commit
|
commitdiff
|
tree
2006-06-21
Junio C Hamano
M
e
rge branch
'jc
/
upload-cor
r
upt
'
into n
e
xt
commit
|
commitdiff
|
tree
2006-06-21
Junio
C Ha
m
an
o
Me
r
ge branch 'jn/web'
i
nto next
commit
|
commitdiff
|
tree
2006-06-21
Junio C
Haman
o
daemon: send st
d
err to
/
d
ev/n
u
ll instead of closing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Jakub Narebski
git
w
eb: Make
u
se of $
P
ATH_INFO for
p
r
o
ject paramet
e
r
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Linus
To
r
valds
Fix grow_refs_h
a
s
h()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
J
unio
C H
a
mano
Mer
g
e branch 'ew
/
rebase' into next
commit
|
commitdiff
|
tree
2006-06-21
Eric Wong
reb
a
se: error out
for NO_P
Y
THON
i
f the
y
use re
c
ur
s
ive
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Junio
C Hamano
A
d
d renamin
g
-reb
a
se tes
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
E
r
ic
W
ong
reba
s
e: All
o
w mer
g
e
strateg
i
e
s
t
o be used when rebasing
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Andre
N
oll
object-refs: avoid division by
zero
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Junio C Hamano
Me
r
g
e bra
n
ch 'ff/c99'
into next
commit
|
commitdiff
|
tree
2006-06-21
Junio C Hamano
M
e
rge
branch 'jc/upload-cor
r
upt' into next
commit
|
commitdiff
|
tree
2006-06-21
Junio C Hamano
upload-
p
ack/fetch-
p
ack: supp
o
rt side-band communication
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Junio
C
H
amano
Re
t
i
re git-clone-pack
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Junio C Ha
m
ano
up
l
o
ad-p
a
ck: prepare for sideband mess
a
ge s
u
ppor
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Junio C
Hamano
upload-pack: avoid
s
ending an incomplet
e
pack
upon
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Ju
n
i
o C Hamano
Merge b
r
anch
'
jn
/
web'
i
n
to n
e
xt
commit
|
commitdiff
|
tree
2006-06-21
Uwe Zei
s
b
e
rg
e
r
Fix possible out-of-b
o
unds array ac
c
e
s
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Jakub Narebski
Mov
e
$g
i
tb
i
n earli
e
r in gitweb
.
c
g
i
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Ja
k
ub
N
a
reb
s
k
i
Add git version
t
o
gitweb output
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
J
akub Narebsk
i
g
i
tweb
:
whitespac
e
cleanup
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
J
u
ni
o
C
Hamano
M
e
rge branch 'master
'
in
t
o n
e
xt
commit
|
commitdiff
|
tree
2006-06-21
Junio C
Haman
o
c
h
eckou
t
-f:
do not leave untracked wor
k
ing
t
ree files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next