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
Fix earlier mismerges.
2006-06-04
Junio
C Hamano
F
ix earlier mismer
g
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-04
J
u
nio C
H
a
m
a
no
Me
r
ge branch
'
new' of git://git
.
kernel
.
org
/
pub/scm
.
.
.
commit
|
commitdiff
|
tree
2006-06-04
Junio C
H
amano
Merge
b
ranch 'vb/sendemail'
i
n
to next
commit
|
commitdiff
|
tree
2006-06-04
Junio C Hamano
Me
r
g
e
branch '
l
t/tree-2'
commit
|
commitdiff
|
tree
2006-06-04
Junio C
Hamano
M
erge branc
h
'sp/re
f
log'
commit
|
commitdiff
|
tree
2006-06-04
Ju
n
io C Hamano
Merge br
a
nch '
f
f/svnimport'
commit
|
commitdiff
|
tree
2006-06-04
Junio C
Hamano
rea
d
-tree --rese
t
:
u
p
date working tree
f
i
l
e
for c
o
nf
l
i
c
t
e
d
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-04
Junio
C H
a
m
a
no
Merge branc
h
'j
c
/fm
t
-patc
h
'
commit
|
commitdiff
|
tree
2006-06-04
Juni
o
C Hamano
f
e
tch: do not re
p
o
rt "same" unless -
v
erbose
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-03
Jun
i
o C Hamano
Me
r
ge branc
h
'jc/fmt-patc
h
' into next
commit
|
commitdiff
|
tree
2006-06-03
Junio C
H
amano
Merge br
a
nch
'
ds
/
d
oc' into j
c
/fmt-patch
commit
|
commitdiff
|
tree
2006-06-02
Junio C Hama
n
o
Merg
e
branch 'mas
t
er' into n
e
xt
commit
|
commitdiff
|
tree
2006-06-02
Junio C
H
amano
Merge branch 'lt/tree-2
'
into n
e
xt
commit
|
commitdiff
|
tree
2006-06-02
Ju
n
io C Hamano
fetch
.
c:
d
o no
t
call
p
roce
s
s_tree() from proces
s
_tree()
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-02
Ju
n
io C Ham
a
no
Mer
g
e branch 'jc/fmt-patch' into next
commit
|
commitdiff
|
tree
2006-06-02
Junio C Hamano
Merge
b
ranch 'nh/http'
commit
|
commitdiff
|
tree
2006-06-01
Juni
o
C Hamano
Merge bra
n
ch 'm
a
ster' into
ne
x
t
commit
|
commitdiff
|
tree
2006-06-01
Ju
n
io C Hamano
Merge git://git
.
kernel
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2006-06-01
Junio C Hamano
M
e
rge branch 'master' into ne
x
t
commit
|
commitdiff
|
tree
2006-06-01
Juni
o
C Hamano
Mer
g
e branc
h
'
nh/http' into next
commit
|
commitdiff
|
tree
2006-05-31
J
u
nio C Hama
n
o
M
erge b
r
anch 'sp
/
reflog' into next
commit
|
commitdiff
|
tree
2006-05-31
Junio C Ham
a
no
fet
c
h
.
c:
do not pass uninitialized lock to
u
n
l
o
ck_ref()
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-31
Junio C Hamano
Merge branch 'jc/fmt-patch' into
n
ext
commit
|
commitdiff
|
tree
2006-05-31
Juni
o
C Ha
m
ano
format-pa
t
ch -
-
s
ig
n
off
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-31
Junio C Hamano
Merge branc
h
'ff/svnimport' into n
e
x
t
commit
|
commitdiff
|
tree
2006-05-31
Junio C
H
amano
Merge b
r
anch 'lt/tree-2' in
t
o
next
commit
|
commitdiff
|
tree
2006-05-30
J
unio C
H
amano
Merge branch 'ew/tests'
commit
|
commitdiff
|
tree
2006-05-30
Juni
o
C
H
a
m
ano
M
erge branch 'master'
in
t
o next
commit
|
commitdiff
|
tree
2006-05-30
Junio
C H
a
mano
send-email: d
o
not pass
b
ogus address t
o
local sendmail
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-30
Junio C Hamano
Merg
e
b
r
anch 'jc/lt-tree-n-cache-tree
'
in
t
o next
commit
|
commitdiff
|
tree
2006-05-30
Jun
i
o C Hamano
Merge branch 'jc/lt-t
r
ee-n
-
ca
c
he
-
tree' into lt/
t
ree-2
commit
|
commitdiff
|
tree
2006-05-30
Ju
n
io
C
H
a
mano
adjust t
o
the rebased se
r
ies by Linus
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-29
J
u
n
io C Hamano
Me
r
ge branch
'jc/lt-tree-n-cache-tree' int
o
next
commit
|
commitdiff
|
tree
2006-05-29
J
u
nio C
H
amano
Me
r
ge
b
ra
n
ch
'
l
t
/apply'
commit
|
commitdiff
|
tree
2006-05-29
Junio C Ha
m
ano
Me
r
g
e
branch '
j
c/cache
-
tree'
commit
|
commitdiff
|
tree
2006-05-29
Junio C Ha
m
ano
Me
r
ge bra
n
ch 'lt/
t
ree
'
int
o
j
c
/lt-tree-n-cache-t
r
e
e
commit
|
commitdiff
|
tree
2006-05-29
J
u
n
io C H
a
man
o
Mer
g
e branch
'
jc/dirw
a
lk-n-cache-tree'
into jc/cac
h
e
.
.
.
commit
|
commitdiff
|
tree
2006-05-29
J
u
ni
o
C Ha
m
ano
git-
f
etc
h
: avoid u
s
ing "c
a
se
.
.
.
in (arm)"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-28
Junio C Hamano
Merge bran
c
h
'
j
c/cache-tree'
i
nto next
commit
|
commitdiff
|
tree
2006-05-28
Junio C Hamano
M
e
rge branch 'm
a
ster' in
t
o n
e
xt
commit
|
commitdiff
|
tree
2006-05-28
Junio C Hamano
Merge bra
n
ch
'jc/mailinfo'
commit
|
commitdiff
|
tree
2006-05-28
J
u
n
i
o C Ham
a
no
M
erg
e
bra
n
c
h
'
eb/mailinfo'
commit
|
commitdiff
|
tree
2006-05-28
Junio C Hamano
Le
t
git-clon
e
to
p
ass --template=dir opt
i
on t
o
g
i
t
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-28
Junio C Ha
m
ano
format
-
pat
c
h: -n a
n
d
-k are mut
u
ally exclu
s
ive
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-26
J
u
nio C Hamano
Merge branch 'mas
t
er'
i
nto next
commit
|
commitdiff
|
tree
2006-05-26
Junio C Hamano
built-in
fo
r
m
a
t-
p
atc
h
: var
i
ous fixups
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-26
J
unio C Haman
o
[
P
ATCH] gitk: start-
u
p bugf
i
x
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-26
J
unio
C
Ham
a
no
Merge bran
c
h
'
eb/ma
i
lin
f
o' into next
commit
|
commitdiff
|
tree
2006-05-26
Junio C Hamano
Merge bra
n
ch 'ew/tests' into next
commit
|
commitdiff
|
tree
2006-05-26
Junio C Hamano
mailinf
o
:
More carefully p
a
r
se header
lin
e
s i
n
read_o
n
e_head
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-25
Junio C Hamano
Merg
e
branc
h
'
s
p/refl
o
g' into
n
ext
commit
|
commitdiff
|
tree
2006-05-25
Junio C Hamano
Mer
g
e br
a
nch 'jc/f
e
tchupload' int
o
ne
x
t
commit
|
commitdiff
|
tree
2006-05-25
Jun
i
o C Hamano
f
et
c
h-pack
:
give up after getting
t
o
o
m
any "ack c
o
ntinue
"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-25
Junio C Hamano
ls-remote:
fix rsync:// to report HE
A
D
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-24
Ju
n
io C Haman
o
Merge branch 'sp/reflog' into ne
x
t
commit
|
commitdiff
|
tree
2006-05-24
Jun
i
o C H
a
mano
Mer
g
e bran
c
h '
m
aste
r
' in
t
o sp/reflog
commit
|
commitdiff
|
tree
2006-05-24
Junio C Hamano
fetch
.
c
: r
e
m
ove an un
u
sed variable and dea
d
c
o
de
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-24
Junio C Ham
a
no
Me
r
g
e b
r
anch
'
l
t/a
p
ply' into
n
ext
commit
|
commitdiff
|
tree
2006-05-24
J
u
n
io C Hamano
Me
r
ge b
r
anch 'maste
r
' int
o
l
t/ap
p
l
y
commit
|
commitdiff
|
tree
2006-05-24
Juni
o
C Hamano
a
p
ply:
f
orce matching at the beginning
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-24
Junio C Hamano
Merge
b
ranch 'jc/fmt-pat
c
h'
commit
|
commitdiff
|
tree
2006-05-24
Juni
o
C Haman
o
Merge branch '
b
e/tag'
commit
|
commitdiff
|
tree
2006-05-24
Jun
i
o
C Hamano
M
e
rge branch 'js/fmt-patch'
commit
|
commitdiff
|
tree
2006-05-24
Junio C Haman
o
Merge branch 'jc/bu
i
l
t
in
-
n-tar-tree'
commit
|
commitdiff
|
tree
2006-05-24
J
unio C Hama
n
o
Merge
b
ra
n
ch '
j
c/fet
c
h-sort
e
d'
commit
|
commitdiff
|
tree
2006-05-24
J
un
i
o C Hamano
Me
r
ge branch 'lt/di
r
w
alk
'
commit
|
commitdiff
|
tree
2006-05-24
Junio C Hama
n
o
Merge
br
a
nch 'maste
r
'
i
nto
n
ext
commit
|
commitdiff
|
tree
2006-05-23
Junio C Hama
n
o
M
e
r
g
e
b
r
anch 'mas
t
er' in
t
o next
commit
|
commitdiff
|
tree
2006-05-23
J
unio C Hamano
c
vsimport: do n
o
t
b
arf on crea
t
ion of
a
n
e
mpty
fi
l
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-23
Junio C Hamano
Me
r
ge branch 'sp/r
e
f
log' int
o
n
ext
commit
|
commitdiff
|
tree
2006-05-23
Junio C Hamano
M
e
rge branch 'eb
/
m
ailinfo' into
n
e
xt
commit
|
commitdiff
|
tree
2006-05-23
Juni
o
C Hamano
Me
r
ge branch 'be
/
tag
'
into next
commit
|
commitdiff
|
tree
2006-05-23
Jun
i
o
C
Hamano
Mer
g
e branch
'
j
c/
b
uiltin-n-tar-tre
e
' i
n
to next
commit
|
commitdiff
|
tree
2006-05-23
Junio
C Hamano
M
er
g
e
b
r
anch 'jc/tartree'
into jc/bu
i
ltin-n-
t
ar
-
tree
commit
|
commitdiff
|
tree
2006-05-23
J
unio
C Hamano
Merg
e
branch 'jc/dirwalk-n-
c
ache-tree' into ne
x
t
commit
|
commitdiff
|
tree
2006-05-23
Juni
o
C Hamano
b
u
iltin-rm: squ
e
lch com
p
iler
warn
i
ngs
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-23
Junio C Hamano
Merge bra
n
ch 'maste
r
' int
o
n
ext
commit
|
commitdiff
|
tree
2006-05-23
Junio C Hamano
M
erge branch 'se/http' into next
commit
|
commitdiff
|
tree
2006-05-23
J
unio C
Hamano
M
e
r
g
e branch 'jc/fmt-patch' into next
commit
|
commitdiff
|
tree
2006-05-22
Jun
i
o C
H
a
m
a
n
o
T
u
torial #2: br
o
ken
l
ink fix
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-22
Junio C Hamano
Merge
branch 'jc/
f
et
c
h-s
o
rted' into ne
x
t
commit
|
commitdiff
|
tree
2006-05-22
Ju
n
io
C
Ham
a
n
o
fe
t
ch-p
a
ck: output refs in
the o
r
de
r
they were g
i
v
en
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-22
Junio C Hamano
M
erge bra
n
ch 'master' into
n
ext
commit
|
commitdiff
|
tree
2006-05-22
Junio C Ha
m
ano
diff: minor option comb
i
na
t
ion f
i
x
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-22
J
u
nio C Hamano
builtin f
o
rm
a
t
-
p
at
c
h: s
q
uelch content-type fo
r
7-bit
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-22
Junio C Hamano
CMIT_FMT_EMAIL: Q-e
n
code Subje
c
t: and
displa
y
-name
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-22
J
unio C Hamano
Merge branch 'jc/maili
n
fo' int
o
next
commit
|
commitdiff
|
tree
2006-05-22
Junio C Hamano
mailinfo: s
k
ip bogus UNIX From line insi
d
e body
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-22
Ju
n
io
C
Hama
n
o
t
u
t
orial-2: typofi
x
in examples
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-21
Junio C H
a
ma
n
o
Mer
g
e
b
ran
c
h 'j
s
/f
m
t-patch' i
n
to
n
ex
t
commit
|
commitdiff
|
tree
2006-05-21
J
unio C Ha
m
ano
git-rebase
:
use c
a
nonical A
.
.
B syntax to format
-
patch
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-21
Jun
i
o C Ha
m
a
no
che
c
k
diff_co
n
su
m
e: strtol parameter fix
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-21
Juni
o
C
Ha
m
ano
Merge b
r
a
nch 'js/fmt-patc
h
' into next
commit
|
commitdiff
|
tree
2006-05-21
Junio C Ha
m
ano
git
-
f
ormat-patch: now bu
i
lt-in
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-21
J
u
n
i
o C H
a
ma
n
o
Merge
b
ranch
'
m
aster' into js/fmt-patch
commit
|
commitdiff
|
tree
2006-05-20
Junio C Hamano
Merge branch 'jc/dirwalk-
n
-cache-
t
ree' int
o
n
ext
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-05-20
Junio
C Hamano
Merge branch 'lt/dirwalk' into jc/di
r
walk-n-cache-tree
commit
|
commitdiff
|
tree
2006-05-20
J
u
n
io C Hamano
Merge branch 'jc/cache-tr
e
e'
into j
c
/
dirwalk-
n
-cache
.
.
.
commit
|
commitdiff
|
tree
2006-05-20
Juni
o
C Ha
m
ano
M
erge branch 'jc/t
a
rtree' into
next
commit
|
commitdiff
|
tree
2006-05-20
Junio C
H
ama
n
o
Merge
b
r
an
c
h 'mas
t
er' into next
commit
|
commitdiff
|
tree
next