repo.or.cz
/
git
/
jnareb-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 Ha
m
ano
Fix ea
r
li
e
r
mismerges
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-04
J
unio
C
Hamano
Merge branc
h
'new
'
of gi
t
://g
i
t
.
kernel
.
org/pu
b
/scm
.
.
.
commit
|
commitdiff
|
tree
2006-06-04
Junio C Hamano
M
e
rge branc
h
'v
b
/
s
endemail' into next
commit
|
commitdiff
|
tree
2006-06-04
Juni
o
C H
a
mano
Merg
e
branch 'lt/tree-2'
commit
|
commitdiff
|
tree
2006-06-04
Junio C Hamano
Merge bra
n
ch 'sp/reflog
'
commit
|
commitdiff
|
tree
2006-06-04
J
u
nio C Hamano
Merg
e
branch
'
f
f
/svnimpo
r
t'
commit
|
commitdiff
|
tree
2006-06-04
Junio
C
Hamano
read-t
r
ee --reset: update wor
k
in
g
tree file for co
n
flicted
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-04
Jun
i
o C Haman
o
Merge bran
c
h 'jc
/
fmt-patch'
commit
|
commitdiff
|
tree
2006-06-04
Junio
C
Hamano
fetch: do not
r
e
port "same" unless -verbose
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-03
Jun
i
o C Ha
m
an
o
Merge branch 'jc/fmt-pat
c
h' into
n
ext
commit
|
commitdiff
|
tree
2006-06-03
Junio C Hamano
Merge branch 'ds/doc' in
t
o jc/fmt-patch
commit
|
commitdiff
|
tree
2006-06-02
Junio
C Ha
m
an
o
Merg
e
branch
'
master' into
next
commit
|
commitdiff
|
tree
2006-06-02
Junio C Hamano
Me
r
ge bran
c
h 'lt/tree-2'
i
nto next
commit
|
commitdiff
|
tree
2006-06-02
Ju
n
io C Ha
m
ano
f
etch
.
c:
d
o not call
pro
c
ess_tree() from
p
rocess_tree()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-02
Jun
i
o C Hamano
Merge
branc
h
'jc
/
fm
t
-p
a
tch'
i
nto next
commit
|
commitdiff
|
tree
2006-06-02
Junio C Hamano
M
e
rge
b
r
anch
'
nh
/
h
t
t
p
'
commit
|
commitdiff
|
tree
2006-06-01
Junio C Ham
a
no
Merge b
r
anc
h
'master' into next
commit
|
commitdiff
|
tree
2006-06-01
Junio C H
a
m
ano
Merge git://git
.
k
ern
e
l
.
org/
p
ub/scm/g
i
tk/gitk
commit
|
commitdiff
|
tree
2006-06-01
Junio
C
Hamano
Merge branc
h
'master'
into next
commit
|
commitdiff
|
tree
2006-06-01
Junio C Hamano
Merge branch 'nh/http
'
i
n
t
o
n
ext
commit
|
commitdiff
|
tree
2006-05-31
Junio C Ham
a
no
Merg
e
b
r
anch 'sp/
r
ef
l
og' into next
commit
|
commitdiff
|
tree
2006-05-31
Junio C
H
amano
fetch
.
c: do not pa
s
s uninitialized lo
c
k
t
o
u
n
lock_ref(
)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-31
Junio C Ham
a
no
Merg
e
bra
n
c
h
'j
c
/
fmt-p
a
tch' into next
commit
|
commitdiff
|
tree
2006-05-31
Junio C Hamano
format-patch --signoff
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-31
Juni
o
C
H
ama
n
o
Merg
e
branch 'ff
/
sv
n
import' into next
commit
|
commitdiff
|
tree
2006-05-31
Jun
i
o C Hamano
Me
r
ge
b
r
a
nch 'lt
/
tree-2' int
o
n
ext
commit
|
commitdiff
|
tree
2006-05-30
Junio
C
Hamano
Merge branch 'ew/test
s
'
commit
|
commitdiff
|
tree
2006-05-30
Junio C H
a
mano
Merg
e
branch 'mas
t
e
r
' into ne
x
t
commit
|
commitdiff
|
tree
2006-05-30
Junio
C
H
a
man
o
send-email: do not pa
s
s bogus
a
ddress to local se
n
dmail
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-30
Junio C Hamano
Merge
b
ranch 'jc
/
lt-tree-
n
-ca
c
he-tre
e
' in
t
o
next
commit
|
commitdiff
|
tree
2006-05-30
Jun
i
o
C
H
amano
Merge branch 'jc/
l
t-t
r
ee-n-cach
e
-tree'
into lt/tree-2
commit
|
commitdiff
|
tree
2006-05-30
Junio C Ha
m
ano
adjust to the rebased series
by Linus
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-29
Junio C
H
amano
Merge branc
h
'jc/lt-t
r
e
e-n-cache-tree'
i
nto
n
e
xt
commit
|
commitdiff
|
tree
2006-05-29
J
un
i
o C Hama
n
o
Merge branch 'lt/ap
p
ly'
commit
|
commitdiff
|
tree
2006-05-29
J
unio C H
a
man
o
Merge
br
a
nch '
j
c/cach
e
-
t
ree'
commit
|
commitdiff
|
tree
2006-05-29
Junio C
H
amano
M
erge
branch 'lt/tree' i
n
to jc/
l
t-tree-n-c
a
che-tr
e
e
commit
|
commitdiff
|
tree
2006-05-29
Ju
n
io C
H
amano
Merge bran
c
h
'jc/dirwalk-n-ca
c
he-tr
e
e' i
n
t
o jc/c
a
che
.
.
.
commit
|
commitdiff
|
tree
2006-05-29
J
u
nio
C Hama
n
o
git-fetch: avoid u
s
ing
"case
.
.
.
in (ar
m
)"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-28
Junio C Hamano
Merge b
r
anch
'
j
c
/
c
ache-tree' into next
commit
|
commitdiff
|
tree
2006-05-28
J
u
nio
C
Hamano
Merge b
r
a
nch 'master' into next
commit
|
commitdiff
|
tree
2006-05-28
Junio
C
H
amano
Merge
branch 'jc/mailinfo'
commit
|
commitdiff
|
tree
2006-05-28
Junio C Hamano
M
e
r
g
e branch
'
eb/mailinfo'
commit
|
commitdiff
|
tree
2006-05-28
J
un
i
o C
Ham
a
n
o
Let
g
it-c
l
one
to pass --t
e
mplate=dir option to git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-28
Jun
i
o C H
a
mano
format
-
patch: -
n
a
n
d -k ar
e
m
ut
u
ally e
x
clu
s
ive
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-26
J
unio C Hamano
Merge
branc
h
'master' int
o
next
commit
|
commitdiff
|
tree
2006-05-26
Ju
n
io C Hamano
built-in format-p
a
tch: various fixups
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-26
Junio C Hamano
[PATC
H
]
git
k
:
start-up
b
u
g
fix
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-26
Junio
C
Ha
m
ano
M
erge branch 'e
b
/mailinf
o
' into next
commit
|
commitdiff
|
tree
2006-05-26
Junio C Hamano
Merge
branch 'ew/
t
ests' i
n
to next
commit
|
commitdiff
|
tree
2006-05-26
Junio C
H
amano
mailinfo: Mo
r
e carefully parse header lines
i
n
read_on
e
_head
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-25
Junio C Hama
n
o
Merge bran
c
h 'sp
/
reflog' into next
commit
|
commitdiff
|
tree
2006-05-25
Junio
C
Ha
m
ano
Merge branch 'jc/f
e
tchup
l
oad' int
o
next
commit
|
commitdiff
|
tree
2006-05-25
Junio C Ha
m
an
o
fetch-p
a
ck: g
i
v
e
up after g
e
t
t
ing t
o
o many
"ack continue"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-25
Junio C Ham
a
n
o
l
s-remote: f
i
x rsync:// to repo
r
t
H
EAD
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-24
Jun
i
o C Hamano
Merge branch 'sp/r
e
flog' into next
commit
|
commitdiff
|
tree
2006-05-24
Junio C H
a
mano
Merge bran
c
h
'
master
'
into sp
/
ref
l
og
commit
|
commitdiff
|
tree
2006-05-24
Juni
o
C Hamano
fet
c
h
.
c: remove an un
u
sed v
a
ria
b
le and dead code
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-24
Juni
o
C Ham
a
no
Merge
b
ranch 'lt/a
p
ply
'
int
o
nex
t
commit
|
commitdiff
|
tree
2006-05-24
Ju
n
i
o C
H
amano
Merg
e
branch
'
master' into
lt/apply
commit
|
commitdiff
|
tree
2006-05-24
Junio C Hamano
a
pply: f
o
r
c
e matchi
n
g at
t
he beginning
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-24
Junio C Hamano
Merge
branch 'jc/fmt
-
pat
c
h'
commit
|
commitdiff
|
tree
2006-05-24
Junio C Hamano
M
e
rge branch '
b
e/
t
ag'
commit
|
commitdiff
|
tree
2006-05-24
Junio
C
Hama
n
o
Merge branch 'js/fmt-pat
c
h'
commit
|
commitdiff
|
tree
2006-05-24
J
uni
o
C
H
amano
Merge
b
ranch
'
jc/b
u
iltin-n-tar-tree'
commit
|
commitdiff
|
tree
2006-05-24
Junio C Hamano
Merge branch
'
jc/fet
c
h-sorted'
commit
|
commitdiff
|
tree
2006-05-24
J
u
n
io C
Ha
m
ano
Merge branch 'lt/dirwalk'
commit
|
commitdiff
|
tree
2006-05-24
J
unio C
Hamano
Merge br
a
nch 'maste
r
' into next
commit
|
commitdiff
|
tree
2006-05-23
J
unio C
H
a
mano
M
erge branch 'master' into next
commit
|
commitdiff
|
tree
2006-05-23
J
unio C Hamano
c
vsimport:
do not barf on creation of an empty file
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-23
Junio C Hamano
Merge b
r
anch 'sp/reflog'
i
nto
n
ext
commit
|
commitdiff
|
tree
2006-05-23
Junio C Hamano
Merge
b
r
anch
'e
b
/mailinf
o
' into next
commit
|
commitdiff
|
tree
2006-05-23
Ju
n
io C
H
amano
Merge
b
ranch 'be/tag' into next
commit
|
commitdiff
|
tree
2006-05-23
Junio C Hamano
Merg
e
branch '
j
c/
b
uiltin-n-
t
ar-tree
'
into next
commit
|
commitdiff
|
tree
2006-05-23
Ju
n
io C Ham
a
no
Mer
g
e branch
'
jc/tart
r
ee
'
i
n
t
o jc/built
i
n
-
n-tar-tre
e
commit
|
commitdiff
|
tree
2006-05-23
Junio C
H
a
mano
Merge branch 'jc/dirwalk
-
n
-cache-tree'
i
n
to ne
x
t
commit
|
commitdiff
|
tree
2006-05-23
Ju
n
io C Hamano
bu
i
lt
i
n-rm: sq
u
e
l
c
h
compil
e
r warnings
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-23
Jun
i
o C Ha
m
ano
Merge branch 'master' into next
commit
|
commitdiff
|
tree
2006-05-23
Junio C Haman
o
M
e
rge branch 'se/ht
t
p
' int
o
next
commit
|
commitdiff
|
tree
2006-05-23
J
u
nio
C H
a
mano
Merg
e
branch 'jc/fmt-patch' i
n
to next
commit
|
commitdiff
|
tree
2006-05-22
Junio C Hamano
Tut
o
rial
#
2
: bro
k
en l
i
nk
f
i
x
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-22
Junio C Hamano
Merge b
r
anch 'jc/fetch-sorted' into next
commit
|
commitdiff
|
tree
2006-05-22
Junio
C
Ha
m
ano
fet
c
h-pack: output re
f
s in the order
t
hey
were gi
v
en
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-22
Junio
C
Hamano
M
erg
e
branch 'master'
into next
commit
|
commitdiff
|
tree
2006-05-22
J
u
nio C Hamano
diff:
m
inor
o
ption combination f
i
x
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-22
Junio C Hamano
builtin f
o
r
mat-patch: squ
e
lch content-ty
p
e for 7-bit
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-22
Junio C Haman
o
CMIT_FMT_EMAIL: Q-encode Subject: and di
s
p
lay-name
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-22
Junio C Ha
m
ano
M
e
rg
e
bra
n
c
h
'jc/m
a
ilinfo'
i
nto next
commit
|
commitdiff
|
tree
2006-05-22
Junio C
H
ama
n
o
mailin
f
o: skip bogus
U
NIX Fro
m
l
ine insid
e
body
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-22
Jun
i
o
C
H
a
m
ano
tutorial-2: typo
f
ix i
n
e
x
a
m
ples
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-21
Juni
o
C Haman
o
Merge branch
'
j
s/fmt
-
patch' into next
commit
|
commitdiff
|
tree
2006-05-21
J
unio C
Hamano
git-rebase:
use
canonical A
.
.
B synta
x
t
o form
a
t-patc
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-21
J
u
n
i
o
C
H
amano
checkd
i
ff_consu
m
e
:
st
r
tol pa
r
ameter
f
ix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-21
Junio C Hamano
Me
r
ge branch 'js/fmt-patch' into next
commit
|
commitdiff
|
tree
2006-05-21
Ju
n
io C Hamano
git-f
o
rmat-pat
c
h: now bui
l
t-i
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-21
Junio C Hamano
M
erge br
a
n
c
h 'master
'
into js/
f
mt-patch
commit
|
commitdiff
|
tree
2006-05-20
Junio C Hamano
Merge branch 'jc/dirwa
l
k
-
n-
c
ache-tree' into next
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-05-20
Ju
n
io C Ham
a
no
Merge branch 'lt/dirwa
l
k' i
n
to j
c
/dirwalk-n-c
a
che-tree
commit
|
commitdiff
|
tree
2006-05-20
J
u
nio C Hamano
Merge br
a
nch
'
jc/cac
h
e
-tre
e
' into jc/
d
irwalk-n-cache
.
.
.
commit
|
commitdiff
|
tree
2006-05-20
Junio
C
H
amano
Merge branch 'jc/tartree' into n
e
x
t
commit
|
commitdiff
|
tree
2006-05-20
J
uni
o
C Ha
m
a
no
Mer
g
e
branch 'ma
s
ter'
into next
commit
|
commitdiff
|
tree
next