repo.or.cz
/
git
/
dscho.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
read-tree -u one-w
a
y merge fix to check out loca
l
l
y
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-14
Junio C H
a
mano
Merge
branc
h
'
f
ix'
commit
|
commitdiff
|
tree
2006-05-14
Junio C Hamano
M
e
rge branch 'ml/cvs'
commit
|
commitdiff
|
tree
2006-05-14
Junio
C
Hamano
Merge branch
'
fi
x
'
commit
|
commitdiff
|
tree
2006-05-10
Ju
n
io C Hamano
M
erge branch 'fix'
commit
|
commitdiff
|
tree
2006-05-10
Junio C Hamano
checkout:
use
--aggressive when
r
unni
n
g a 3-way merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-09
J
u
nio C Ha
m
a
no
Merge branch 'jc/
c
le
a
n'
commit
|
commitdiff
|
tree
2006-05-09
Junio C Hamano
Merge branch 'mw/a
l
t
er
n
ates'
commit
|
commitdiff
|
tree
2006-05-09
Junio C Hamano
Mer
g
e branc
h
'
jc/xsha
1
'
commit
|
commitdiff
|
tree
2006-05-09
Ju
n
io C H
a
mano
Merge branch 'jc/
a
gain'
commit
|
commitdiff
|
tree
2006-05-09
Junio C Ha
m
ano
Me
r
ge
bra
n
ch 'np/delta'
commit
|
commitdiff
|
tree
2006-05-09
Junio C Hamano
Merge branch 'jc/bind
i
f
f
'
commit
|
commitdiff
|
tree
2006-05-09
Junio C Hamano
Merge branch 'fix'
commit
|
commitdiff
|
tree
2006-05-09
J
u
nio C Hamano
Merge branch '
t
ojunio'
of http:
/
/
locke
.
catalys
t
.
net
.
.
.
commit
|
commitdiff
|
tree
2006-05-08
Junio C Ham
a
no
Te
a
c
h
git-c
l
ean optional <paths>
.
.
.
parameters
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-08
Junio C
H
a
mano
M
e
r
g
e
b
r
anch 'fix'
commit
|
commitdiff
|
tree
2006-05-08
Juni
o
C
Hamano
get_sha1() - fix
infinite loop o
n
nonexistent sta
g
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-08
Ju
n
io C Hamano
D
o
cumenta
t
ion:
{c
a
ret} fixes (git-rev-
l
ist
.
t
x
t)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-08
Junio C Ha
m
ano
Fix repo-config set
-
m
u
l
tivar er
r
or return path
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-07
J
uni
o
C Hama
n
o
Merge b
r
anch '
f
ix'
commit
|
commitdiff
|
tree
2006-05-07
Junio C
Ham
a
no
repo-co
n
fig: documen
t
what value_
r
e
gexp does a bit
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-06
J
u
n
i
o
C
Hamano
binar
y
diff and apply:
tes
t
suite
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-06
J
u
nio C Hamano
u
pdate-index --ag
a
in
:
take optional pathspecs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-06
Junio C Ham
a
no
update-index --a
g
a
i
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-06
Junio C Hamano
update-index:
plug memor
y
leak f
r
om prefix_path()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-06
Junio C Hamano
c
heckout-i
n
de
x
: plug memory leak from prefix_path()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-06
Juni
o
C
Hamano
u
pdate-index --unr
e
solve
:
work from a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-05
Junio C H
a
m
a
no
binary d
i
ff: further upd
a
tes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-05
Juni
o
C Hamano
b
i
n
ary pa
t
ch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-05
Junio
C Hamano
pack-ob
j
ect: squ
e
lch
ey
e
-candy on
n
o
n-tty
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-05
Jun
i
o C Hamano
Merge bra
n
ch 'f
i
x'
commit
|
commitdiff
|
tree
2006-05-05
J
u
nio C Hamano
core
.
p
r
efer
s
ymli
n
kr
e
fs: use sym
l
inks for
.
git/HEA
D
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-05
Junio C
Ha
m
ano
delta: stricter
co
n
s
t
ness
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-05
Juni
o
C Ham
a
no
Makefile: do not link rev-list any spe
c
ially
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-04
J
unio C Haman
o
M
e
r
g
e branch 'jc/log
s
'
commit
|
commitdiff
|
tree
2006-05-04
J
u
ni
o
C
Hamano
Merge branch 'jc/show-branch-dense'
commit
|
commitdiff
|
tree
2006-05-04
Junio C Ha
m
ano
Merge branch 'j
c
/
s
ym
r
ef'
commit
|
commitdiff
|
tree
2006-05-04
Junio
C H
a
m
a
no
Me
r
g
e
branch '
j
c/diff'
commit
|
commitdiff
|
tree
2006-05-04
Junio C
H
amano
Me
r
ge bra
n
ch 'js/repoconfig'
commit
|
commitdiff
|
tree
2006-05-04
Juni
o
C Hama
n
o
Merge branch 'jc/count'
commit
|
commitdiff
|
tree
2006-05-04
J
unio C Ha
m
a
n
o
Merg
e
b
r
anch
'js/remo
t
ec
o
n
f
ig'
commit
|
commitdiff
|
tree
2006-05-04
J
u
n
io C Hamano
Merg
e
b
ranch 'main
t
'
commit
|
commitdiff
|
tree
2006-05-04
Junio C Hamano
Merge br
a
n
ch 'fix'
commit
|
commitdiff
|
tree
2006-05-03
Jun
i
o
C Hamano
built
i
n-co
u
nt
-
ob
j
ects
:
open pa
c
ks when runn
i
n
g
-
v
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-03
Junio C Hamano
repo-
c
onf
i
g: readability
f
ixups
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-03
Junio
C Ham
a
no
core
.
pre
f
ersymli
n
k
r
e
f
s: use
symlinks
f
o
r
.
git/HEAD
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-03
Juni
o
C
Hamano
Merge git
:
//git
.
kernel
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2006-05-02
Junio
C
H
amano
Merge
b
ranch
'
fix'
commit
|
commitdiff
|
tree
2006-05-02
Junio C
Hamano
Revert "fetch, pu
l
l: ask config
for remo
t
e in
f
orma
t
ion"
commit
|
commitdiff
|
tree
2006-05-02
J
unio C
Hamano
b
u
i
l
t
in-push: mak
e
it
of
f
ic
i
al
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-02
Junio C Hamano
show-bran
c
h
: om
i
t u
n
interesting
m
erge
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-02
J
u
n
i
o C
H
a
mano
builtin-log/whatchanged/s
h
ow: make them official
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-02
Junio
C
H
amano
bu
i
ltin-
d
iff: ca
l
l it "git-diff", re
a
lly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-02
J
u
nio C H
a
mano
builtin-count
-
obj
e
cts: make it official
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-02
Junio C H
a
ma
n
o
Me
r
ge branch
'jc/xsha1-2'
commit
|
commitdiff
|
tree
2006-05-02
J
unio C Hama
n
o
Merge b
r
anch 'jc/p
a
ck'
commit
|
commitdiff
|
tree
2006-05-02
Junio C
H
amano
Me
r
g
e
branch 'jc/p
a
t
hc
h
eck'
commit
|
commitdiff
|
tree
2006-05-02
Junio C Ham
a
no
Merge bran
c
h 'nh/fetch-ht
t
p'
commit
|
commitdiff
|
tree
2006-05-02
Junio C Hamano
Me
r
ge branch 'se/rebase'
commit
|
commitdiff
|
tree
2006-05-01
Junio C Hamano
get_sha
1
(
)
: :path and :
[
0-3]:pat
h
to
ex
t
ract from index
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-01
Junio
C
Hamano
Extended SHA1 -- "re
v
^@"
syntax to mean "all pa
r
ents"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-30
Juni
o
C Ham
a
no
Fix
b
uil
t
in-push to honor P
u
sh: li
n
es in r
e
m
o
tes file
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-30
Juni
o
C Ham
a
no
Merge branch 'fix
'
commit
|
commitdiff
|
tree
2006-04-30
Junio C Ha
m
ano
builtin-
d
iff
.
c: die() forma
t
ting type f
i
x
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-29
Jun
i
o C Ha
m
ano
built-in dif
f
: asso
r
te
d
updates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-29
Junio C
H
am
a
no
built-
i
n d
i
f
f
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-28
Junio C Hamano
Merge bra
n
ch 'fix'
commit
|
commitdiff
|
tree
2006-04-28
Juni
o
C Haman
o
g
i
t-am
--resolve
d
: more us
a
ble
e
rr
o
r messa
g
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-28
Junio
C
Hamano
bu
i
lt-in co
u
nt-o
b
jects
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-28
Junio C
H
am
a
no
p
a
ck-o
b
jec
t
s: update size he
u
ri
s
t
ucs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-27
Junio C Haman
o
Merge b
r
a
n
c
h 'fix'
commit
|
commitdiff
|
tree
2006-04-27
Juni
o
C Hamano
v
e
rify-pack: check int
e
grity in a s
a
ner
o
r
d
er
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-27
Juni
o
C
H
amano
Merge branch
'
pb/c
o
n
fig'
commit
|
commitdiff
|
tree
2006-04-27
Junio C Hamano
M
erge branch 'jc/diffstat'
commit
|
commitdiff
|
tree
2006-04-27
Junio C Hamano
diff-in
d
ex
:
fix
c
o
mpi
l
ation warnings
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-27
J
u
nio C Ha
m
ano
t0000
-
basic: more commit-tree tests
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-27
Jun
i
o C Hamano
revision parsin
g
: make "
r
e
v
-- p
a
ths" checks str
o
nger
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-27
Jun
i
o C H
a
ma
n
o
Merge b
r
anch 'fix'
commit
|
commitdiff
|
tree
2006-04-26
Junio C
H
am
a
no
comm
i
t-tree
.
c:
c
heck_valid() microopti
m
i
zation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-26
Juni
o
C Ham
a
no
rebase
:
typ
o
fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-26
Jun
i
o C Hamano
commit-tr
e
e
: allow generic
o
b
j
ect name for the tre
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-26
J
u
nio C Hamano
Makefile: remove and create xdiff library
f
rom scratch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-26
Junio C
Hama
n
o
t000
0
-bas
i
c: Add ls-tree recursive te
s
t back
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-26
Juni
o
C Ha
m
ano
git
-
cvsse
r
ver: typofixes
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-26
Junio C
H
a
mano
diff
-
-stat: show c
o
mplete
rewrites c
o
ns
i
stent
l
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-26
Ju
n
io C Ha
m
a
no
Merge branch 'jc/di
f
f
'
commit
|
commitdiff
|
tree
2006-04-26
Junio C Ha
m
ano
Make
f
ile
:
re
m
ove and create libgi
t
.
a from scratch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-25
Juni
o
C Haman
o
Merg
e
branc
h
'fix'
commit
|
commitdiff
|
tree
2006-04-24
J
u
n
io C Ha
m
ano
Merge
b
r
anch
'ar
/
chmo
d
-
s
eries
'
commit
|
commitdiff
|
tree
2006-04-24
Junio C
H
amano
Mer
g
e branch 'sh/daemon'
commit
|
commitdiff
|
tree
2006-04-24
Jun
i
o C Hama
n
o
Merge
branch 'jc/cc-stat'
commit
|
commitdiff
|
tree
2006-04-24
Ju
n
io C
Hamano
Mer
g
e bran
c
h
'
jc/unresolve
'
commit
|
commitdiff
|
tree
2006-04-24
Junio C Hama
n
o
Mer
g
e
branc
h
'
j
c/color'
commit
|
commitdiff
|
tree
2006-04-24
J
u
nio C Ham
a
no
M
erg
e
git://git
.
k
ernel
.
o
rg/
p
u
b
/scm/gitk
/
g
i
tk
commit
|
commitdiff
|
tree
2006-04-22
Jun
i
o C
Hamano
L
i
bified diff-index: bac
k
ward com
p
atib
i
lity fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-22
Juni
o
C Hama
n
o
Libi
f
y dif
f
-inde
x
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-22
Juni
o
C Hama
n
o
L
ib
i
fy diff-files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-22
Jun
i
o C Hamano
Fix "g
i
t
s
h
o
w --stat"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-22
Ju
n
io C Hamano
Ad
d
colordi
f
f for git to con
t
rib/co
l
or
d
iff
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-22
Jun
i
o
C Hama
n
o
Merge br
a
nch
'jc/diff'
commit
|
commitdiff
|
tree
next