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 Haman
o
r
ead-
t
ree
-
u one-way merge
f
ix to ch
e
ck out locally
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-14
Junio C Hamano
M
erge bran
c
h 'fix
'
commit
|
commitdiff
|
tree
2006-05-14
J
unio C Hamano
M
e
rge
b
ranch 'ml/cvs
'
commit
|
commitdiff
|
tree
2006-05-14
J
unio C Hamano
Mer
g
e bran
c
h 'fi
x
'
commit
|
commitdiff
|
tree
2006-05-10
Junio C Hamano
M
erge b
r
anch 'fix'
commit
|
commitdiff
|
tree
2006-05-10
J
u
nio C Hamano
checkout:
u
se -
-
aggre
s
s
ive when running a
3
-way
m
erge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-09
Junio C Ham
a
n
o
M
e
rg
e
branch 'jc/c
l
ean'
commit
|
commitdiff
|
tree
2006-05-09
J
uni
o
C Haman
o
Merge branch '
m
w/alternates'
commit
|
commitdiff
|
tree
2006-05-09
J
u
nio C H
a
man
o
Merge branch 'jc/xsha
1
'
commit
|
commitdiff
|
tree
2006-05-09
Junio C Hamano
Merge
b
r
anch 'jc/again'
commit
|
commitdiff
|
tree
2006-05-09
Junio C Hamano
M
e
rge branch
'
np/delta
'
commit
|
commitdiff
|
tree
2006-05-09
J
u
n
io C Hamano
Merge bra
n
ch 'jc/bindif
f
'
commit
|
commitdiff
|
tree
2006-05-09
J
u
n
i
o
C
H
a
mano
Merge branch 'fix'
commit
|
commitdiff
|
tree
2006-05-09
Junio
C Ha
m
a
no
Merge
branch 'tojunio' of http://locke
.
catalyst
.
ne
t
.
.
.
commit
|
commitdiff
|
tree
2006-05-08
J
unio C Hamano
T
each g
i
t-
c
lean optional
<paths
>
.
.
.
para
m
e
t
ers
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-08
Junio C Hamano
Me
r
ge
b
ranc
h
'
f
ix'
commit
|
commitdiff
|
tree
2006-05-08
Junio
C
Hamano
get_s
h
a1()
- fix inf
i
n
ite
loop on nonexist
e
nt stage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-08
Junio C Hamano
Documentati
o
n
:
{ca
r
et} f
i
xes (git-r
e
v-list
.
txt)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-08
Junio C Ha
m
ano
Fix repo-
c
onfig se
t
-multivar
e
rror return path
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-07
Junio C Hamano
Merge branch 'fix
'
commit
|
commitdiff
|
tree
2006-05-07
Junio
C Hamano
repo-config:
d
oc
u
men
t
what valu
e
_regexp does a bit
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-06
Junio C Hamano
binary diff and appl
y
: tests
u
ite
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-06
J
un
i
o C H
a
mano
u
pd
a
te-in
d
ex
-
-
ag
a
in: take optional pathspec
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-06
Junio
C Hamano
update-index --
a
ga
i
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-06
Junio C Ha
m
a
n
o
up
d
ate-index: plug m
e
mory leak from pre
f
ix_path()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-06
J
unio C Hamano
checkout-index
:
plug mem
o
ry leak from prefix_path()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-06
Junio C Hamano
u
pdate-index --unresolve: w
o
rk from a subdirector
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-05
Junio C Hamano
binar
y
diff: further
u
pd
a
tes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-05
Junio C Hamano
binary patch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-05
Junio C H
a
mano
p
ack
-
object: sque
l
c
h
e
y
e-candy o
n
non-tt
y
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-05
Juni
o
C Haman
o
M
erge br
a
nc
h
'fi
x
'
commit
|
commitdiff
|
tree
2006-05-05
Junio C Hamano
c
o
re
.
prefersymlinkre
f
s: use symlinks for
.
git/HEAD
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-05
Juni
o
C Ha
m
ano
delta: stricter con
s
tness
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-05
Juni
o
C Ha
m
ano
M
ak
e
file: d
o
n
o
t
link rev-list any specially
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-04
Junio C Hamano
Merge branc
h
'jc/lo
g
s'
commit
|
commitdiff
|
tree
2006-05-04
Junio C Ham
a
no
Merge br
a
nch
'
jc/show-b
r
anch-dense'
commit
|
commitdiff
|
tree
2006-05-04
Junio C Haman
o
Merge branch 'jc/s
y
mref'
commit
|
commitdiff
|
tree
2006-05-04
Junio C H
a
man
o
Merge branch 'jc/d
i
ff'
commit
|
commitdiff
|
tree
2006-05-04
J
u
nio C Haman
o
Merge b
r
a
nch 'js/
r
epoc
o
n
fig'
commit
|
commitdiff
|
tree
2006-05-04
Junio C Ha
m
ano
M
erge br
a
nch 'jc/count'
commit
|
commitdiff
|
tree
2006-05-04
Junio C Hamano
Merge branch 'js/re
m
oteconfig'
commit
|
commitdiff
|
tree
2006-05-04
Junio C Ha
m
ano
Merge br
a
n
ch 'maint'
commit
|
commitdiff
|
tree
2006-05-04
J
u
n
i
o C
Ha
m
ano
Merge branch
'
fix'
commit
|
commitdiff
|
tree
2006-05-03
J
u
n
i
o
C
Hamano
builtin-count-objects: open
p
acks when runn
i
ng -v
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-03
Junio C
H
aman
o
r
epo-config
:
readabi
l
i
t
y fixups
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-03
Junio C Hamano
co
r
e
.
prefersymlinkr
e
f
s
: use syml
i
nks
f
or
.
gi
t
/
H
EAD
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-03
Junio C H
a
mano
M
erge git://g
i
t
.
ker
n
el
.
org/pub/scm/
g
itk/
g
i
tk
commit
|
commitdiff
|
tree
2006-05-02
Junio C Hamano
Merge branch 'fix'
commit
|
commitdiff
|
tree
2006-05-02
Juni
o
C Hamano
Revert "fetch,
pull: ask config for remote inf
o
rmation"
commit
|
commitdiff
|
tree
2006-05-02
Junio C Ham
a
no
bui
l
t
i
n
-
p
u
sh: make
i
t
official
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-02
Junio C Hamano
sho
w
-
bra
n
ch: omi
t
uni
n
t
e
r
esting
m
erges
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-02
Junio C
H
amano
builtin-log/wha
t
changed/show:
make t
h
em offic
i
al
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-02
Junio C H
a
mano
builtin-diff
:
call it
"
git-diff", rea
l
ly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-02
J
u
n
io C Hamano
builti
n
-count
-
objects: make it
o
f
f
icial
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-02
Juni
o
C Ham
a
n
o
Me
r
ge branch '
j
c/xsha1-2'
commit
|
commitdiff
|
tree
2006-05-02
Junio
C
H
a
mano
Merge branch 'jc/pack'
commit
|
commitdiff
|
tree
2006-05-02
J
unio C
Hamano
Me
r
ge
b
ranch
'jc/path
c
heck'
commit
|
commitdiff
|
tree
2006-05-02
Ju
n
io
C
H
a
mano
Merge branch
'nh/fetch-http'
commit
|
commitdiff
|
tree
2006-05-02
Jun
i
o C Hamano
Merge branch 'se/rebase'
commit
|
commitdiff
|
tree
2006-05-01
Junio C
H
a
m
ano
get_sha1():
:path a
n
d
:[0-3]:path to
ex
t
r
a
ct f
r
om i
n
dex
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-01
J
unio C
H
amano
E
x
tended SHA1 -- "rev^@
"
synta
x
to
mean "all parents
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-30
Juni
o
C
Hamano
Fix builtin-p
u
s
h to hon
o
r Push:
lines in remotes
f
i
le
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-30
Junio C Hamano
Merge branch 'fix'
commit
|
commitdiff
|
tree
2006-04-30
Junio C
H
amano
builtin
-
d
i
ff
.
c:
die(
)
form
a
t
t
ing type
f
i
x
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-29
Junio C Hamano
built
-
in diff: assorted u
p
dates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-29
Junio C Hamano
built-in
d
iff
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-28
Junio
C
Ha
m
an
o
Merge branc
h
'fix'
commit
|
commitdiff
|
tree
2006-04-28
Ju
n
io C Hamano
git-am --resolve
d
: mo
r
e usable e
r
ror messa
g
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-28
J
u
n
i
o C Hamano
built-in count-
o
bject
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-28
Junio C Hamano
pack-objects: update size heuri
s
tuc
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-27
Junio C Hamano
Me
r
ge branch '
f
ix
'
commit
|
commitdiff
|
tree
2006-04-27
Junio C
Hamano
verify-pac
k
:
chec
k
integ
r
it
y
in a saner o
r
de
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-27
Ju
n
io C Hamano
Merge
bra
n
ch 'pb/config'
commit
|
commitdiff
|
tree
2006-04-27
Junio C Hamano
Merg
e
b
r
anch 'j
c
/diffst
a
t'
commit
|
commitdiff
|
tree
2006-04-27
Ju
n
io C Ha
m
a
n
o
d
iff-index: fix compilat
i
o
n warnings
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-27
J
u
nio C
Hamano
t0000
-
b
asic: more
c
o
mmit
-
tree te
s
ts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-27
Ju
n
i
o C Hamano
revis
i
on
p
arsi
n
g: ma
k
e "rev -- paths" checks stronger
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-27
Junio C
H
amano
Mer
g
e branch
'
fix'
commit
|
commitdiff
|
tree
2006-04-26
Junio C Hamano
comm
i
t-tr
e
e
.
c: chec
k
_valid() microop
t
i
mization
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-26
Junio C
H
ama
n
o
rebase: ty
p
ofi
x
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-26
Junio C
H
amano
c
o
mmit-tree:
a
l
l
o
w
g
en
e
ric obj
e
ct name for the tree
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-26
Juni
o
C Haman
o
Makefile: remov
e
a
n
d
c
reate
xdiff library
fr
o
m scra
t
ch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-26
Junio
C
H
a
m
a
no
t0000-basic: A
d
d ls-t
r
ee re
c
u
rsiv
e
test back
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-26
Juni
o
C Hamano
git-cvss
e
rv
e
r: typofixes
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-26
Junio
C Hamano
diff --stat: sho
w
comple
t
e
rewrites co
n
s
i
stent
l
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-26
J
u
nio C Ham
a
no
M
erge br
a
nch 'j
c
/diff'
commit
|
commitdiff
|
tree
2006-04-26
J
u
nio C Ha
m
ano
Makefile: remov
e
and
c
reat
e
libgi
t
.
a f
r
om scratch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-25
J
u
nio
C
H
a
mano
Merge branch 'fi
x
'
commit
|
commitdiff
|
tree
2006-04-24
Junio C
H
amano
Merge branch 'ar/c
h
mod-series'
commit
|
commitdiff
|
tree
2006-04-24
Junio C Hamano
Merge branch 'sh/d
a
emon'
commit
|
commitdiff
|
tree
2006-04-24
Junio C Haman
o
M
e
rge branch 'jc/
c
c-stat
'
commit
|
commitdiff
|
tree
2006-04-24
Junio C Hamano
Merge branch 'jc/unr
e
solve'
commit
|
commitdiff
|
tree
2006-04-24
Junio C Hama
n
o
Merge bra
n
ch 'j
c
/
c
olor'
commit
|
commitdiff
|
tree
2006-04-24
Ju
n
io C H
a
mano
Merge git://git
.
kernel
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2006-04-22
Juni
o
C Hamano
Li
b
ified diff
-
ind
e
x
:
backward compatibility fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-22
Ju
n
io C Hama
n
o
Libify
d
i
ff-index
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-22
Juni
o
C Hama
n
o
Lib
i
fy d
i
ff-files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-22
Junio C
H
amano
F
ix
"gi
t
s
h
ow --stat"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-22
Jun
i
o
C H
a
m
a
no
Add colordiff for git to
contrib/colordiff
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-22
J
uni
o
C Hamano
Mer
g
e branch '
j
c
/diff'
commit
|
commitdiff
|
tree
next