repo.or.cz
/
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
H
amano
re
a
d
-tree -u one-way merge
f
i
x to check out l
o
cal
l
y
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-14
Junio C Hamano
Merg
e
bra
n
c
h 'fix'
commit
|
commitdiff
|
tree
2006-05-14
Junio
C
Ham
a
no
Mer
g
e
b
r
a
n
c
h
'
m
l
/
c
v
s
'
commit
|
commitdiff
|
tree
2006-05-14
Junio C H
a
mano
Merge
br
a
nc
h
'fix'
commit
|
commitdiff
|
tree
2006-05-10
J
unio C
Hamano
Merge branch 'fix'
commit
|
commitdiff
|
tree
2006-05-10
J
unio C Ha
m
a
n
o
c
h
e
ckout: use -
-
aggress
i
ve when
running
a
3-way merg
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-09
Junio
C H
a
mano
Merge branch 'jc/clean'
commit
|
commitdiff
|
tree
2006-05-09
Junio C Hamano
M
erge
b
ranch 'mw/altern
a
tes'
commit
|
commitdiff
|
tree
2006-05-09
Junio C Hamano
Merge b
r
anch 'jc/x
s
ha1'
commit
|
commitdiff
|
tree
2006-05-09
J
u
nio C Ha
m
a
no
Merge branch
'
jc/again'
commit
|
commitdiff
|
tree
2006-05-09
Junio
C
H
a
m
ano
Merge bra
n
c
h 'n
p
/de
l
ta'
commit
|
commitdiff
|
tree
2006-05-09
Junio C Hamano
M
er
g
e
b
ranch 'j
c
/bindiff'
commit
|
commitdiff
|
tree
2006-05-09
Junio C
H
amano
Merge
branch 'fi
x
'
commit
|
commitdiff
|
tree
2006-05-09
J
u
n
i
o C Hamano
M
erge
branch 'to
j
unio
'
of http://locke
.
ca
t
alyst
.
net
.
.
.
commit
|
commitdiff
|
tree
2006-05-08
Junio C Hamano
Teach git-clean optional <paths>
.
.
.
p
a
rameters
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-08
Junio C Ham
a
no
Merge branch 'fix
'
commit
|
commitdiff
|
tree
2006-05-08
Ju
n
i
o
C Hama
n
o
get_sha1
(
) - f
i
x i
n
finite
l
oop on
non
e
xisten
t
sta
g
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-08
Junio C Hama
n
o
Doc
u
ment
a
tio
n
:
{caret
}
fixes
(g
i
t-rev-lis
t
.
tx
t
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-08
Jun
i
o C Ha
m
ano
F
ix repo-con
f
ig set-mult
i
var error retu
r
n
p
a
th
.
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
H
amano
repo-config: docu
m
ent what v
a
lue_regex
p
does
a
b
it
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-06
Junio C Hamano
binary
d
iff and a
p
ply:
t
estsuit
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-06
Junio C Hamano
update-ind
e
x
-
-again: take optional pathspecs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-06
Junio C Hamano
u
pdate-index
--a
g
ain
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-06
Junio C Hamano
update-index: plug memory l
e
ak from prefix_path()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-06
Junio C
H
amano
chec
k
out-index: plug m
e
mory leak fr
o
m p
r
ef
i
x_path(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-06
J
unio C Ham
a
n
o
update-ind
e
x --unre
s
olve: w
o
rk from a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-05
Junio C
Hamano
binary diff: further up
d
ates
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-05
Junio
C
H
amano
binar
y
p
atch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-05
Junio C Haman
o
pack-object: s
q
uelch eye-candy on non-tty
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-05
Junio C H
a
mano
Merge br
a
nch 'fix'
commit
|
commitdiff
|
tree
2006-05-05
J
uni
o
C
Hamano
core
.
prefersymlinkrefs: use sy
m
links for
.
git/HEAD
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-05
Ju
n
i
o C Hamano
delta: strict
e
r cons
t
ness
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-05
Junio C Haman
o
M
a
kefile: do not li
n
k
rev
-
list a
n
y specially
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-04
Juni
o
C Hamano
Merge bran
c
h '
j
c
/logs'
commit
|
commitdiff
|
tree
2006-05-04
Junio
C
Hamano
Merge bran
c
h 'jc/sh
o
w-branch-den
s
e'
commit
|
commitdiff
|
tree
2006-05-04
Jun
i
o C Hamano
Merge b
r
anch
'jc/s
y
mref'
commit
|
commitdiff
|
tree
2006-05-04
Jun
i
o
C Hamano
Merge branch 'jc/diff'
commit
|
commitdiff
|
tree
2006-05-04
J
u
n
i
o
C
Ha
m
an
o
Merge bra
n
ch 'js/repoconfig'
commit
|
commitdiff
|
tree
2006-05-04
J
unio C
H
aman
o
Merge br
a
nc
h
'
jc
/
count'
commit
|
commitdiff
|
tree
2006-05-04
Junio C Hamano
Merge b
r
anch 'js/remoteconfig'
commit
|
commitdiff
|
tree
2006-05-04
Junio C Haman
o
Mer
g
e branch 'm
a
in
t
'
commit
|
commitdiff
|
tree
2006-05-04
Ju
n
i
o
C H
a
m
a
no
Merge branch 'fix'
commit
|
commitdiff
|
tree
2006-05-03
Junio C Hamano
builtin-count-objects: open packs when runn
i
ng -v
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-03
Ju
n
io C Hamano
repo-confi
g
: re
a
dability f
i
xups
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-03
Junio
C
H
a
m
an
o
core
.
prefersymlinkrefs: us
e
symlin
k
s f
o
r
.
git/HEAD
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-03
Junio C Ha
m
ano
Merge git://git
.
kernel
.
org/pub/
s
cm/gitk/g
i
tk
commit
|
commitdiff
|
tree
2006-05-02
J
unio C Ham
a
no
Merge branch 'fix'
commit
|
commitdiff
|
tree
2006-05-02
Jun
i
o C Haman
o
R
ev
e
rt "fe
t
ch, pull: ask co
n
fig
f
or remote
i
nformation
"
commit
|
commitdiff
|
tree
2006-05-02
Ju
n
io
C
Hamano
built
i
n-push: m
a
k
e it official
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-02
Junio C Hamano
sh
o
w-branch: omit
u
nin
t
ere
s
ting
m
erges
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-02
Junio C Hamano
b
uiltin-log/what
c
hang
e
d/show: make them official
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-02
Junio C Hamano
builtin-
d
iff: call
i
t "git-diff", r
e
all
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-02
Junio C Ha
m
ano
builtin-count-objects: make it official
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-02
Junio C Hamano
Merge br
a
nch 'jc/xsha1-2'
commit
|
commitdiff
|
tree
2006-05-02
Jun
i
o C Hamano
Merge bran
c
h
'
jc
/
pa
c
k
'
commit
|
commitdiff
|
tree
2006-05-02
Junio
C Hama
n
o
Mer
g
e bra
n
ch 'jc/pa
t
hc
h
eck'
commit
|
commitdiff
|
tree
2006-05-02
J
u
nio C Hamano
Merge bra
n
ch
'
nh/
f
e
t
c
h
-http'
commit
|
commitdiff
|
tree
2006-05-02
Junio
C
Hama
n
o
Merg
e
branch 'se/rebas
e
'
commit
|
commitdiff
|
tree
2006-05-01
Junio C Hamano
get_sha1(): :p
a
th and
:
[0-3]:p
a
t
h to extract
fr
o
m index
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-01
Junio C
Hamano
Ext
e
n
ded S
H
A1 -- "rev^@" syntax to mean "all parents"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-30
Juni
o
C
H
a
m
ano
Fix
builtin-push to honor
Pus
h
: lines in remotes file
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-30
Junio C Hamano
Mer
g
e b
r
anch 'fix'
commit
|
commitdiff
|
tree
2006-04-30
Junio C Hamano
builtin-diff
.
c: die() formatting type
fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-29
J
u
nio C Hamano
b
u
i
lt-in diff: assorte
d
updat
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-29
Junio C H
a
mano
b
uilt
-
in d
i
f
f
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-28
Junio C Ha
m
a
no
Merge branch 'fix'
commit
|
commitdiff
|
tree
2006-04-28
J
uni
o
C Haman
o
git-
a
m --resolve
d
: more
us
a
bl
e
erro
r
message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-28
Ju
n
io C H
a
mano
built-in count
-
ob
j
ects
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-28
Juni
o
C Hamano
pack
-
obj
e
cts: update size heuristucs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-27
J
unio C
H
amano
Merge bra
n
ch 'fix'
commit
|
commitdiff
|
tree
2006-04-27
Junio
C
H
amano
verify-pack: check integ
r
ity in a saner order
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-27
J
u
nio C H
a
mano
Mer
g
e branch
'
p
b
/confi
g
'
commit
|
commitdiff
|
tree
2006-04-27
J
unio C Hamano
Merge branch 'jc/diffstat'
commit
|
commitdiff
|
tree
2006-04-27
Ju
n
io C Ha
m
a
no
diff-index: fix c
o
mpilat
i
on war
n
ings
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-27
Junio C Hamano
t000
0
-basic: m
o
re
c
ommit-tree tests
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-27
J
u
nio C Hamano
r
e
v
ision
p
arsin
g
: make "rev
-
- paths" chec
k
s stronger
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-27
Junio C Hamano
Mer
g
e branch 'fix'
commit
|
commitdiff
|
tree
2006-04-26
J
unio
C Ham
a
no
commit-tre
e
.
c: chec
k
_
vali
d
()
m
icro
o
ptim
i
z
ation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-26
Junio C
Ha
m
an
o
rebase: typ
o
fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-26
J
u
nio
C
Haman
o
com
m
it-tree
:
allow gene
r
ic obj
e
ct
n
ame for the tree
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-26
Junio
C
Hamano
Makefile: remove and create xdi
f
f
library
f
rom scratch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-26
Ju
n
i
o
C Hamano
t
0
000-ba
s
ic: Add ls-
t
ree
r
ecursive t
e
s
t
bac
k
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-26
Junio C Hamano
gi
t
-
cvsserver: typo
f
ixe
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-26
Junio
C Hamano
diff --stat: sh
o
w compl
e
t
e rewrites c
o
nsistently
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-26
J
unio
C
Ha
m
an
o
Merge branch 'jc/diff'
commit
|
commitdiff
|
tree
2006-04-26
Junio C Hamano
M
a
k
e
file: remove and
create libg
i
t
.
a fro
m
s
cra
t
ch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-25
J
u
nio C H
a
mano
M
erge bran
c
h 'fix'
commit
|
commitdiff
|
tree
2006-04-24
Junio C Hamano
M
e
rg
e
branch 'ar
/
chmod-
s
eries'
commit
|
commitdiff
|
tree
2006-04-24
Junio C Hamano
Merge branch 'sh/daemo
n
'
commit
|
commitdiff
|
tree
2006-04-24
Junio C Hamano
Merge branch '
j
c/cc-stat'
commit
|
commitdiff
|
tree
2006-04-24
Junio
C
Hamano
M
erge
b
r
anch
'jc
/
unresolve'
commit
|
commitdiff
|
tree
2006-04-24
Junio
C
Hamano
Merge branch
'jc/color'
commit
|
commitdiff
|
tree
2006-04-24
Junio C Hamano
Merge git://g
i
t
.
ker
n
el
.
org/pub/scm/gitk
/
gitk
commit
|
commitdiff
|
tree
2006-04-22
J
uni
o
C Hamano
Libified diff-i
n
d
e
x: b
a
ckward compati
b
ili
t
y f
i
x
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-22
Jun
i
o C Hamano
Libify d
i
f
f
-in
d
ex
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-22
J
u
nio C Hamano
Libi
f
y diff-f
i
les
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-22
Junio C Hamano
Fix "git show --stat
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-22
Jun
i
o C Hamano
A
dd color
d
if
f
for gi
t
to contrib/colordiff
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-04-22
Junio
C
H
amano
Merg
e
branch
'jc/dif
f
'
commit
|
commitdiff
|
tree
next