repo.or.cz
/
alt-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
read-tree -u one-way merge fix to check out locally modified paths.
2006-05-15
Junio C Hamano
rea
d
-tree -u on
e
-way merge fix to chec
k
o
ut locally
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-14
Linus Torvalds
Simplify "git reset
--hard"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-14
Linus Torvalds
Allow one-way
t
ree
merge to re
m
ove o
l
d f
i
l
es
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-14
J
unio C Hama
n
o
Merge br
a
n
c
h '
f
ix'
commit
|
commitdiff
|
tree
2006-05-14
Ben Clifford
include hea
d
er to define uint32_
t
, necess
a
ry on Mac
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-14
Junio C Hamano
M
e
rg
e
b
ran
c
h 'ml/cvs'
commit
|
commitdiff
|
tree
2006-05-14
Junio C Haman
o
Merge branc
h
'fix'
commit
|
commitdiff
|
tree
2006-05-13
Dennis Stosb
e
rg
F
ix git-pac
k
-objects for 64-bit platfor
m
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-10
Nico
l
a
s Pi
t
r
e
fix diff-delta
bad mem
o
ry access
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-10
Junio C Hamano
Merge branch '
f
ix'
commit
|
commitdiff
|
tree
2006-05-10
J
u
n
io C Ha
m
ano
che
c
kout: use --aggressive w
h
en run
n
ing
a 3-way merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-10
Linus Torvalds
revert/cherry-p
i
ck
:
use a
g
g
r
essive merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-09
Jun
i
o C Hamano
Merge
b
ranch 'jc/clean'
commit
|
commitdiff
|
tree
2006-05-09
Junio
C
Hamano
Merge branch 'mw
/
alter
n
a
t
es'
commit
|
commitdiff
|
tree
2006-05-09
Junio C
Hamano
M
e
rge branch 'jc/
x
sh
a
1'
commit
|
commitdiff
|
tree
2006-05-09
Junio C Ha
m
a
no
Mer
g
e br
a
nch 'jc/again'
commit
|
commitdiff
|
tree
2006-05-09
Juni
o
C Haman
o
M
e
rge
b
ranch 'np/delta'
commit
|
commitdiff
|
tree
2006-05-09
Junio C
H
a
mano
Merge
branch 'jc
/
b
i
ndiff'
commit
|
commitdiff
|
tree
2006-05-09
Junio C Hamano
Merge branch '
f
ix'
commit
|
commitdiff
|
tree
2006-05-09
Junio C Hamano
Mer
g
e branch 'toj
u
n
i
o
' o
f
ht
t
p://
l
ocke
.
catalyst
.
net
.
.
.
commit
|
commitdiff
|
tree
2006-05-09
Yakov Le
r
ne
r
read-cache
.
c: use
x
cal
l
oc() n
o
t calloc()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-09
E
ric
W
o
ng
apply: fix in
f
inite l
o
op with multiple pa
t
ches with
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-08
Junio C Hamano
Teach git-c
l
ean optional
<paths>
.
.
.
p
a
r
ameters
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-08
Junio C Hamano
Merge branch
'
fix'
commit
|
commitdiff
|
tree
2006-05-08
Dmitry V
.
Levin
Separat
e
object na
m
e
erro
r
s from usage errors
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-08
Junio
C
Hamano
get_sha1() -
fix infi
n
ite loop on nonexis
t
ent stage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-08
Ju
n
io C
Haman
o
Do
c
umentation:
{
c
a
r
e
t} fixes (git-
r
ev-li
s
t
.
txt)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-08
N
i
col
a
s Pitre
improve base
8
5
g
ener
a
ted
ass
e
mbly code
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-08
Lin
u
s Torva
l
ds
F
ix "gi
t
dif
f
--st
a
t" with long filenames
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-08
J
unio
C Hamano
Fix r
e
p
o-co
n
fig set-m
u
lt
i
v
ar e
r
ror return path
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-07
Martin Waitz
clo
n
e: do
n
't
clone th
e
in
f
o/a
l
ternat
e
s
file
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-07
Mart
i
n Wai
t
z
te
s
t
c
ase f
o
r transitiv
e
i
n
f
o/alternates
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-07
Mart
i
n
Wa
i
tz
T
r
ans
i
tively
r
ead
a
lternatives
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-07
Junio C Hamano
Merge bran
c
h 'fix'
commit
|
commitdiff
|
tree
2006-05-07
Peter Hagerv
a
l
l
S
p
arse fix
for
bui
l
t
i
n-diff
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-07
Mart
i
n Waitz
repack: honor
-
d even when no n
e
w pac
k
was created
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-07
Martin Wa
i
tz
clone
:
keep --referenc
e
ev
e
n with -l -s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-07
Junio
C
Hamano
repo-config: doc
u
m
ent
what value_regexp doe
s
a
bit
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-07
Pavel R
o
skin
Rele
a
se config lo
c
k
i
f the reg
e
x is
i
nval
i
d
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-07
Matthias Lederhofer
core-tutorial
.
txt: e
s
cape a
s
terisk
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-07
Johannes Sc
h
indelin
Fix users of prefix_path() to free() only wh
e
n
n
e
c
ess
a
r
y
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-07
Johannes Schindelin
F
i
x users of prefix_p
a
th() to
free()
on
l
y
w
hen necessary
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-06
sean
t13
0
0-
r
ep
o
-config: two new c
o
nfi
g
parsi
n
g tests
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-06
sean
Another
c
onfig fi
l
e parsing
fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-06
Juni
o
C Haman
o
binary diff and apply: t
e
st
s
uite
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-06
Junio C Hama
n
o
update-index -
-
again: tak
e
optio
n
al pat
h
spec
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-06
Ju
n
io C H
a
mano
update-inde
x
--a
g
ain
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-06
J
u
n
i
o
C Hamano
update-index
:
plug memory leak fro
m
prefix_pa
t
h
(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-06
J
unio C H
a
mano
check
o
ut-index: pl
u
g memo
r
y leak from
p
refix_pa
t
h(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-06
Juni
o
C Hamano
up
d
a
te-index --unres
o
l
v
e
:
wor
k
f
rom
a subd
i
rectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-05
Junio C Hamano
binary diff: further
updates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-05
Juni
o
C Hamano
bin
a
ry
p
at
c
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-05
Ju
n
io C Hamano
pack-object:
squelch ey
e
-candy
on non-tty
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-05
Junio
C Hamano
Me
r
g
e br
a
nch 'fix'
commit
|
commitdiff
|
tree
2006-05-05
Junio C
H
amano
core
.
prefersymlinkrefs: use symlink
s
for
.
g
i
t/HEAD
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-05
Johann
e
s Schind
e
lin
repo-config:
trim white-space before co
m
ment
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-05
se
a
n
Fi
x
f
or config file se
c
ti
o
n p
a
rsing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-05
sean
C
l
ar
i
fy git-ch
e
rry documentation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-05
s
ean
Update git-
u
n
p
ack
-
obj
e
cts documen
t
ation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-05
sean
Fix up docs where "--" isn't displayed corr
e
ctly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-05
s
ean
Several trivial docu
m
ent
a
ti
o
n to
u
ch ups
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-05
E
r
ic Wong
git-svn
1
.
0
.
0
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-05
Eric
Wong
git-svn: documentation updates
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-05
Junio C Hamano
delta: stricter constn
e
s
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-05
J
unio C Hamano
Makefile: do not lin
k
rev-list a
n
y speciall
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-05
Johannes Schindelin
builtin-push: --all and
-
-tags _are_ explicit refspecs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-04
Junio C Haman
o
Merge bra
n
ch 'j
c
/logs
'
commit
|
commitdiff
|
tree
2006-05-04
J
u
nio C Hamano
Merge b
r
anch
'
jc/show-branch
-
d
e
nse'
commit
|
commitdiff
|
tree
2006-05-04
Junio C Ham
a
no
Merge branch
'jc/s
y
mref'
commit
|
commitdiff
|
tree
2006-05-04
Juni
o
C
Hamano
Mer
g
e
b
ranch 'jc/d
i
ff'
commit
|
commitdiff
|
tree
2006-05-04
Junio C Hamano
Merg
e
bra
n
ch
'
js/rep
o
config
'
commit
|
commitdiff
|
tree
2006-05-04
Junio C Ha
m
ano
Merge br
a
n
c
h 'jc/co
u
nt'
commit
|
commitdiff
|
tree
2006-05-04
Junio C
H
a
mano
Merge branch 'js/remoteconfig'
commit
|
commitdiff
|
tree
2006-05-04
Junio
C Ha
m
ano
M
e
r
ge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2006-05-04
J
o
n
Loelig
e
r
Add a fe
w
more words to the glo
s
s
ary
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-04
Jon Loeliger
Added definitions for a few w
o
rds:
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-04
Jon L
o
el
i
ger
Alphabeti
z
e
the gloss
a
ry
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-04
Linus Torvalds
sha1_to_
h
ex
(
)
usage
c
leanup
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-04
J
u
n
i
o
C
Hamano
Merge b
r
an
c
h 'f
i
x
'
commit
|
commitdiff
|
tree
2006-05-04
Fredrik Kuivinen
blame: F
i
x
p
ath pruning
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-03
Mart
i
n L
a
nghoff
cvs
s
erver: use git
-
rev-lis
t
instead o
f
git
-
log
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-03
J
ohannes Schindelin
repo-
c
onf
i
g
:
d
e
convolute logi
c
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-03
Linu
s
Torvalds
Fix "git-lo
g
--
p
arents" breakage post v1
.
3
.
0
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-03
Matthias Ke
s
tenholz
add documentati
o
n for
u
p
d
a
te-
i
ndex --unresolv
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-03
Matthias Kes
t
e
nh
o
lz
fix vario
u
s
typos
i
n documen
t
at
i
on
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-03
Junio C Ha
m
a
n
o
builtin-coun
t
-
obj
e
c
ts: o
p
en packs when runnin
g
-v
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-03
Nicolas Pitre
i
m
prove d
i
ff-delta
w
it
h
sparse and/or repetiti
v
e dat
a
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-03
Nicolas Pitre
tiny op
t
imizati
o
n
t
o
d
iff-delta
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-03
Junio C
Ham
a
no
repo-co
n
f
i
g
:
readability fixups
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-03
Junio
C
Hama
n
o
core
.
prefersymli
n
krefs: use
sym
l
ink
s
for
.
git/HEAD
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-03
Joha
n
nes Schindelin
repo-conf
i
g
:
s
u
pport --get-regexp
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-03
Junio C Hamano
Mer
g
e git://git
.
kernel
.
org/pu
b
/
scm
/
g
i
t
k
/gitk
commit
|
commitdiff
|
tree
2006-05-02
Junio
C Ham
a
no
Merge branch 'fix
'
commit
|
commitdiff
|
tree
2006-05-02
Martin Langhoff
git-
s
end-em
a
il: fix version s
t
ring to be valid
perl
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-02
Junio C Ham
a
no
Revert "fetch, pull:
a
sk con
f
ig for
remote
inf
o
rmation"
commit
|
commitdiff
|
tree
2006-05-02
Johannes Schi
n
delin
r
epo-config:
tr
i
m white-space be
f
ore c
o
mment
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-02
J
ohanne
s
Sc
h
in
d
elin
re
p
o-config: fi
x
segfault with no a
r
gument
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-02
Robert She
a
r
man
Give the user a hint for how to conti
n
ue in the case
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-02
Jo
h
a
nne
s
S
c
h
indelin
fetch, pull:
ask config
f
or remo
t
e inform
a
t
ion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-02
Jo
h
ann
e
s
S
ch
i
ndelin
builtin-push: also ask
conf
i
g for re
m
o
te in
f
orma
t
ion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next