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
checkout -f failed to check out a file if an existing directory interfered.
2006-06-28
Junio C Hamano
combine-diff
.
c: typ
e
sanity
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Jeff King
quo
t
e
.
c: silence compiler warnings from EMIT macro
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-27
J
ohan
n
es Schindelin
format-patch: use clear_commit_marks() inst
e
ad of some
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-27
J
unio C Hamano
t4013 test updat
e
s f
o
r
n
ew output cod
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-27
Junio C
Ham
a
no
Fix
s
ome
m
or
e
d
i
ff o
p
tions
changes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-27
Junio
C
Hamano
Merg
e
branch
'
j
c/diff-tes
t
' int
o
th/d
i
ff
commit
|
commitdiff
|
tree
2006-06-27
Ti
m
o Hirvonen
Fi
x
diff-tree -s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-27
Timo Hi
r
vonen
log --r
a
w
:
Don't
d
es
c
e
n
d
i
nto subdirec
t
ories by defaul
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-27
T
i
mo Hirvonen
diff-tree
:
Use ---\n as a message s
e
parator
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-27
Timo Hi
r
vonen
Print empty line
betwee
n
raw, stat,
s
ummary an
d
patch
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-27
De
n
nis Stosberg
Fix ex
p
r usage for F
r
e
e
BSD
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-27
Jo
h
ann
e
s
Schindeli
n
t401
4
: fix for
w
hites
p
ace
f
rom
"
wc -l"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-27
Ju
n
io
C Hamano
t4013:
add m
o
re tests
around -c and
-
-cc
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Junio C Ham
a
no
t4014: add format
-
patch --ignore-if
-
in-upst
r
eam test
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Timo H
i
rvonen
whatchan
g
ed: Default to DIFF_FORMAT_RAW
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Tim
o
Hirvo
n
en
D
o
n't
x
c
alloc() str
u
ct diffs
t
at_t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Timo Hir
v
on
e
n
Add
msg_sep t
o
diff_o
p
tions
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Ti
m
o Hi
r
vo
n
en
DIFF
_
FORM
A
T_R
A
W is not d
e
fault anym
o
re
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
T
imo Hi
r
vo
n
e
n
S
e
t default diff outp
u
t format
a
fter parsin
g
command
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Timo Hirv
o
nen
Make --raw option available
for
all diff commands
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Timo Hirvonen
M
erge with_
r
aw, with_stat and summa
r
y variabl
e
s t
o
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Johannes
Sch
i
n
d
elin
format-patch:
i
ntro
d
uce "--i
g
nore
-
if-i
n
-upstream"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Johannes Schin
d
elin
a
dd diff_flu
s
h
_
patch_id() to calculate t
h
e pat
c
h id
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Junio
C H
a
mano
t4013: add test
s
for diff/log fam
i
ly o
u
tput optio
n
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Jun
i
o
C
Hamano
Merg
e
bran
c
h
'jc/squa
s
h
'
commit
|
commitdiff
|
tree
2006-06-26
Junio C Hamano
Merge
branch 'jc/diff'
commit
|
commitdiff
|
tree
2006-06-26
Junio C Ham
a
no
Mer
g
e branch 'ml/
c
vsimport'
commit
|
commitdiff
|
tree
2006-06-26
J
u
nio C
Hamano
Merge
br
a
nch 'js/d
i
ff'
commit
|
commitdiff
|
tree
2006-06-26
Junio C H
a
mano
M
erg
e
branch 'ew/rebase'
commit
|
commitdiff
|
tree
2006-06-26
Dennis Stosb
e
rg
Fix pkt-line
.
h to compi
l
e
with a n
o
n
-
GCC
c
o
mpi
l
e
r
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
D
ennis Stos
b
er
g
Solar
i
s ne
e
ds inclusion
o
f signal
.
h for
s
i
g
n
al()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Matthias L
e
derhofer
co
r
rect docume
n
ta
t
ion for
g
it grep
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Junio C Hamano
git-
r
epack: B
e
c
a
reful when updatin
g
t
h
e
s
ame pack
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
J
unio C Ha
m
ano
diff --
c
o
l
o
r
: use $GIT_DIR/con
f
ig
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
E
r
ic
W
ong
rebase: a
l
l
o
w --skip to
work with --merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Er
i
c Wong
r
e
b
ase: cleanup rebasing
with --m
e
rge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
E
r
ic W
o
ng
rebase: allow --merge option to handle patches merged
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Yann Dirson
git-
c
ommit: filte
r
out log message lines onl
y
w
hen
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Peter Eriksen
Rename safe_strncpy
(
)
to strl
c
py()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Johanne
s
Schindelin
apply: replace NO_ACCURATE_DIF
F
w
i
th
--inaccur
a
t
e-eo
f
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Timo Hirvonen
Clean
up diff
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Johannes Schi
n
d
e
l
i
n
cvsimport: always set
$ENV{GIT_
I
ND
E
X_FILE} to
$i
n
dex
.
.
.
commit
|
commitdiff
|
tree
2006-06-24
Martin Langhoff
cvsimp
o
rt:
s
etup indexe
s
corr
e
ctly for
ancestors a
n
d
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Ju
n
io C Ha
m
an
o
repo
-
co
n
fig: fix print
i
ng of
b
ool
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Junio C Hamano
diff --
c
olo
r
:
u
se reset
sequence when
we
m
ean reset
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Martin Langh
o
ff
git-repack
-- re
s
p
e
ct -q a
n
d be
q
uiet
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Unknown
A better-scheduled P
P
C SHA
-
1
i
mplem
e
ntatio
n
.
commit
|
commitdiff
|
tree
2006-06-24
Jun
i
o C Hama
n
o
t
est-sha1: test ha
s
hing large buffer
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Junio C Ham
a
no
git-me
r
g
e --squash
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
J
unio
C
Hamano
Makefi
l
e: add framewo
r
k
t
o
verify and
b
enc
h
s
h
a1 implementat
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Junio C Ha
m
ano
git-
p
ull
:
abort
w
h
e
n fmt-merg
e
-
m
s
g
f
ails
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Jun
i
o C Hamano
Merg
e
bran
c
h
'pb/e
r
ror'
commit
|
commitdiff
|
tree
2006-06-24
Jun
i
o
C Hamano
u
s
a
ge:
min
i
mum
t
y
pe fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Petr Baudis
C
ustomizable
e
rror
handlers
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Timo Hirvonen
git-merge: Do
n
'
t u
s
e -p when outp
u
tt
i
ng
s
ummary
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Jo
h
annes Schin
d
e
l
in
Teach diff about -b and -w flag
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-23
Jeff Ki
n
g
git-comm
i
t: a
l
low -e o
p
tion anywhe
r
e on
c
o
m
ma
n
d line
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-23
Johannes Schindelin
patch-id: take
"commit" p
r
ef
i
x as well as "diff-tr
e
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
J
u
ni
o
C Hama
n
o
Makefile: do not
r
ecompi
l
e
m
ain
progra
m
s
wh
e
n
librarie
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Matthias
K
estenholz
add GIT-CFLAGS to
.
gitignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Linus To
r
valds
Tw
e
ak dif
f
colors
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hama
n
o
Merg
e
branch '
m
ast
e
r'
in
t
o
nex
t
commit
|
commitdiff
|
tree
2006-06-22
J
u
n
io
C
Ha
m
an
o
Merge branch
'
j
s/l
s
fix
'
commit
|
commitdiff
|
tree
2006-06-22
Junio C
H
a
mano
Merg
e
branch 'ew/rebase'
commit
|
commitdiff
|
tree
2006-06-22
J
unio C Haman
o
M
e
r
ge branch
'
jn/web'
commit
|
commitdiff
|
tree
2006-06-22
J
u
n
io C H
a
mano
Me
r
ge early parts o
f
branch 'j
s
/
diff'
commit
|
commitdiff
|
tree
2006-06-22
Junio C H
a
mano
Merge branch 'jc/upload-corrupt'
commit
|
commitdiff
|
tree
2006-06-22
J
u
nio C
Hama
n
o
Merge branch 'ew/r
e
base' into next
commit
|
commitdiff
|
tree
2006-06-22
Jun
i
o C Hamano
Merge branch 'jn/web' into next
commit
|
commitdiff
|
tree
2006-06-22
Jakub Narebski
gitweb: whitespace cleanup around
'
=
'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
T
i
mo Hirvonen
gitweb: Use $hash_base as $searc
h
_ha
s
h if po
s
sible
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Junio C H
a
mano
Me
r
ge branch 'jc/waitpid'
commit
|
commitdiff
|
tree
2006-06-22
Ju
n
i
o
C Hamano
M
erge branch '
f
f/c99'
commit
|
commitdiff
|
tree
2006-06-22
Junio C Ha
m
ano
M
erge branch 'pb/c
o
nf
i
g
'
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
Merge b
r
anc
h
'lt
/
o
b
jlist'
commit
|
commitdiff
|
tree
2006-06-22
E
r
ic Wong
git
-
s
v
n: fix commit
--edit
f
lag when us
i
ng SVN:: librarie
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
M
akefil
e
: do not force unn
e
ede
d
r
ecompilat
i
on upo
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
r
eb
a
se --merge
:
fix for
rebasing more than 7
c
ommits
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Eri
c
W
.
Bie
d
erman
Check and documen
t
the option
s
to
prevent mistakes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Y
a
kov Lerner
Pass -DDEFAULT_GIT_TEMPL
A
TE
_
D
I
R
o
n
ly
w
h
ere actually
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Jun
i
o C Haman
o
M
e
rge
b
ranc
h
'mast
e
r
'
into next
commit
|
commitdiff
|
tree
2006-06-21
Junio C Hamano
Merge
b
ranch
'
jc/uploa
d
-
c
orrupt' into nex
t
commit
|
commitdiff
|
tree
2006-06-21
Junio C H
a
mano
Mer
g
e branch
'
jn/web'
i
nto next
commit
|
commitdiff
|
tree
2006-06-21
Junio C Hamano
daemon: sen
d
st
d
err to /dev
/
null inst
e
ad of cl
o
s
ing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Ja
k
ub Narebski
g
itwe
b
: Make use of
$PATH_
I
NFO f
o
r
p
r
oje
c
t p
a
rameter
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Linus T
o
rvalds
Fix grow_refs_hash()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Juni
o
C Hamano
Merge br
a
nch 'ew/rebase' into next
commit
|
commitdiff
|
tree
2006-06-21
E
r
ic Wong
rebase:
e
rro
r
o
u
t
f
o
r NO_PYTHON if they us
e
recursive
.
.
.
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
rebase: All
o
w merge
strategies to be used
when
r
ebas
i
ng
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Andre Noll
object-ref
s
: avoid div
i
sion by zer
o
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Junio C Hamano
Mer
g
e branch 'ff
/
c
9
9' in
t
o
nex
t
commit
|
commitdiff
|
tree
2006-06-21
Junio
C Hamano
M
e
rge bran
c
h 'j
c
/upload-corrupt' into next
commit
|
commitdiff
|
tree
2006-06-21
Junio C Ham
a
no
upl
o
ad
-
p
a
ck/fe
t
ch-pack
:
s
upport
side
-
b
a
nd communic
a
tion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
J
unio C Hama
n
o
Reti
r
e git-cl
o
ne-pack
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Jun
i
o C
H
amano
upload-pack: pr
e
p
are for
sideband mess
a
ge s
u
pport
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Junio
C Hamano
u
p
lo
a
d
-
pack:
a
void sending an incomplete pack upon
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Junio C
H
a
m
a
no
Merge br
a
nch
'jn/w
e
b' into next
commit
|
commitdiff
|
tree
2006-06-21
Uwe
Z
eisberger
F
ix
p
ossibl
e
out-of-bo
u
nds
a
rray access
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
J
a
kub Nare
b
ski
M
ove $
g
it
b
in earlier in
g
i
tweb
.
cgi
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next