repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'js/revert-cherry'
2007-03-11
Junio C Ham
a
no
Me
r
ge
branc
h
'js/revert-cherry'
commit
|
commitdiff
|
tree
2007-03-11
Junio
C
Ha
m
a
n
o
Merg
e
branch
'
sp/make
'
commit
|
commitdiff
|
tree
2007-03-11
Junio C Hamano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2007-03-11
Junio C Hamano
Merge
branch
'
m
aint' of
git://linux-
n
fs
.
or
g
/~bfields
.
.
.
commit
|
commitdiff
|
tree
2007-03-08
Junio C Hamano
M
erg
e
bra
n
c
h 'js/con
f
ig-rename'
commit
|
commitdiff
|
tree
2007-03-08
Jun
i
o C Hamano
M
e
r
ge branc
h
'
m
as
t
er' of git://repo
.
o
r
.
cz/git/fastimpor
t
commit
|
commitdiff
|
tree
2007-03-07
J
u
nio C Hamano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2007-03-06
J
u
n
io
C Hamano
Merge branc
h
'm
a
i
n
t'
commit
|
commitdiff
|
tree
2007-03-06
Junio C Ham
a
n
o
Me
r
g
e
branch
'
master' of git://repo
.
or
.
cz/git-g
u
i
into
.
.
.
commit
|
commitdiff
|
tree
2007-03-06
Junio C
H
amano
gi
t
-
bundle: f
i
x pack generation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-06
Ju
n
i
o
C Hamano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-03-06
J
unio C Haman
o
git-commit: cd to top be
f
or
e
showing the final sta
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-06
Junio C Hamano
Merge
branch 'mas
t
e
r
-for-junio' o
f
git://repo
.
or
.
cz
.
.
.
commit
|
commitdiff
|
tree
2007-03-06
Juni
o
C Hamano
Merge br
a
nch 'maint-for-junio' of gi
t
://rep
o
.
o
r
.
c
z
.
.
.
commit
|
commitdiff
|
tree
2007-03-05
Ju
n
io C Hamano
Post 1
.
5
.
0
.
3 cleanu
p
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-05
Junio C Hamano
Merge b
r
anch 'js/fetch-p
r
og
r
ess'
(
ear
l
y
p
art
)
commit
|
commitdiff
|
tree
2007-03-05
Junio C
H
ama
n
o
Me
r
g
e branch 'js/symlink'
commit
|
commitdiff
|
tree
2007-03-05
Junio C Hamano
Merge
b
ranch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-03-05
Junio C Hama
n
o
GIT 1
.
5
.
0
.
3
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-04
Junio C Hamano
di
f
f-ni: allow running from
a subdirector
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-04
Junio C Hamano
M
e
rge
branch 'js
/
d
i
ff
-
ni' (earl
y
part)
commit
|
commitdiff
|
tree
2007-03-04
Junio C Hamano
Mer
g
e branch
'
maint'
commit
|
commitdiff
|
tree
2007-03-03
Jun
i
o C Hamano
git
-
merge: fai
l
correctly
w
hen we cannot fast forw
a
rd
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-03
Junio
C Hamano
M
e
r
g
e
b
ranc
h
'maint'
commit
|
commitdiff
|
tree
2007-03-02
Juni
o
C
Hamano
Merge
b
r
a
n
c
h 'js/commit-format'
commit
|
commitdiff
|
tree
2007-03-02
Junio C Hama
n
o
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-02-28
Junio C Ha
m
ano
A
d
d recent changes to draft 1
.
5
.
1 r
e
lease no
t
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Junio C
H
amano
Merge branch 'js/commi
t
-by-
n
am
e
'
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
Mer
g
e
branc
h
'js/bundle'
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hama
n
o
M
e
rg
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-02-28
Ju
n
io C
H
a
mano
Start prepari
n
g Relea
s
e Notes
f
or 1
.
5
.
0
.
3
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
Document
a
t
i
o
n
: git-remote add [-t
<bra
n
ch>] [-m <branch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Junio
C
Hamano
index_fd(): con
v
er
t
blob only
i
f it is a regula
r
file
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
J
unio
C H
a
m
ano
index_fd(): pass optional path parameter as
h
int for
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
i
n
de
x
_fd(): use enum o
b
ject_t
y
pe
i
ns
t
e
ad of typ
e
name
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Junio C
Hamano
Mer
g
e bra
n
ch
'
n
p
/types'
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
Merge branch 'mc
/
s
e
ndm
a
il'
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
Mer
g
e br
a
n
c
h 'js/diff-ni'
(early
pa
r
t)
commit
|
commitdiff
|
tree
2007-02-28
Junio C
H
am
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-02-27
Jun
i
o C Hamano
Make 'cvs ci' lock
l
e
s
s
in git-c
v
sserver by using git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-27
J
unio C Hamano
Mer
g
e
b
ranch 'maint'
commit
|
commitdiff
|
tree
2007-02-27
J
u
nio C Hamano
git-app
l
y: do not fi
x
w
h
itespa
c
es on context l
i
ne
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
J
unio
C
Hamano
Merge
branc
h
'master
'
into js
/
di
f
f-ni
commit
|
commitdiff
|
tree
2007-02-26
Junio
C
Ha
m
a
n
o
D
ocumenta
t
ion: link in 1
.
5
.
0
.
2
m
aterial to
t
he top
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
J
unio C Hama
n
o
Me
r
ge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-02-26
Juni
o
C
H
ama
n
o
GI
T
1
.
5
.
0
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
Ju
n
io C Hamano
Documentatio
n
:
desc
r
ibe "-f/-t/
-
m"
o
ptions to "g
i
t
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
Ju
n
io C Haman
o
di
f
f -
-
c
c
: fix displa
y
of
sym
l
in
k
conflicts du
r
in
g
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
Junio C Ham
a
no
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-02-26
J
u
nio C Ha
m
an
o
Merge b
r
anch '
j
c/me
r
ge-s
y
mlink' into m
a
int
commit
|
commitdiff
|
tree
2007-02-26
Junio C H
a
m
a
no
merge-
r
ecursive: fix longst
a
nding
bug in
merging symli
n
k
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
Junio C Ham
a
no
merge-index: fi
x
l
o
ngstan
d
in
g
bu
g
in me
r
ging symli
n
ks
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-25
J
u
nio C Haman
o
d
iff --
c
ached: give more
s
ensibl
e
error
m
essage when
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-25
Junio C
H
amano
Merge br
a
nch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-02-25
Junio C
Hamano
A
d
d Release
Notes
to prepar
e
for 1
.
5
.
0
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-25
Junio C Hamano
rerere: do
n
o
t
deal with symlin
k
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-25
J
u
n
i
o
C Hamano
rerere
:
d
o
not
skip t
w
o conflicte
d
paths next to
e
ach
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-25
Junio
C Hamano
Merge git://repo
.
or
.
cz/git-gui into maint
commit
|
commitdiff
|
tree
2007-02-25
Junio C Hamano
Don't
m
odify
CREDI
T
S-FILE
if it ha
s
n
'
t chang
e
d
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-24
Ju
n
i
o
C Ha
m
ano
Evil Merge branch 'jc/st
a
t
u
s
' (early
p
a
r
t) into
js
.
.
.
commit
|
commitdiff
|
tree
2007-02-24
Junio C Hama
n
o
M
e
r
ge branch 'js/apply'
commit
|
commitdiff
|
tree
2007-02-24
Juni
o
C H
a
ma
n
o
Merge bran
c
h 'js
/
no-limit-bou
n
dary'
commit
|
commitdiff
|
tree
2007-02-24
Junio C Hama
n
o
Merge branch 'js/
e
t
c-conf
i
g'
commit
|
commitdiff
|
tree
2007-02-24
Junio
C
H
amano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-02-24
Junio C Ha
m
ano
diff-patc
h
: Avoid
em
i
tting
d
o
uble-slash
e
s in text
u
al
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-24
Junio C Hamano
bundle: re
w
ord m
i
ssing prerequ
i
site error m
e
ssage
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-24
Junio C Hama
n
o
R
eword
gi
t
-am 3
-
way fallback failure me
s
sage
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-23
Junio C Hamano
.
ma
i
lmap maintenance after
p
ulling from git-svn
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-23
Ju
n
i
o
C Hamano
Merge b
r
an
c
hes 'lt
/
crlf' and 'jc/apply-config'
commit
|
commitdiff
|
tree
2007-02-23
Junio C Hamano
Merge
br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-02-22
J
u
n
io C Ha
m
a
n
o
run_di
f
f
_{files,index}(): upda
t
e
c
a
ll
i
ng
c
onvention
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-22
Junio C Hamano
upda
t
e-inde
x
:
do
n
ot die too ea
r
ly in a r
e
ad-
o
nly repository
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-22
J
unio C
Ham
a
n
o
git-s
t
a
t
us: do
not
b
e
totally useless in a
r
ead-only
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-22
J
u
nio C Hamano
t4119: test au
t
ocomputin
g
-p
<
n>
for tradi
t
ional diff
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-22
Junio C Hamano
g
i
t
-apply:
g
u
ess co
r
rect -p
<
n
>
value for
n
o
n
-git pat
c
hes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-21
J
unio C Haman
o
gi
t
-ap
p
ly: notice "diff --git" patch again
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-21
Junio C
Hama
n
o
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hamano
Merge branch
'
m
a
ster' of
git://repo
.
or
.
c
z/git-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-02-21
Ju
n
io C H
a
mano
Fix bo
t
c
h
ed
"leak
f
i
x"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-21
Ju
n
io C Hamano
t4119
:
add test for t
r
aditional
p
atch
and different
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-21
Jun
i
o
C
H
ama
n
o
Merge branch
'
fk/
a
u
t
oconf'
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hama
n
o
Merge branch 'js/n
a
me-rev-f
i
x'
commit
|
commitdiff
|
tree
2007-02-21
Jun
i
o C Hama
n
o
prefixcmp(): fix-
u
p l
e
ftover
s
trncm
p
()
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hamano
p
r
ef
i
xcmp(): fi
x
-up mechanical conversion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-21
Jun
i
o C Hamano
Mecha
n
ical c
o
nversi
o
n to use prefixcmp(
)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-21
Juni
o
C Haman
o
Add pr
e
fixcmp()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-21
Junio
C
Ham
a
no
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2007-02-20
Ju
n
i
o
C Hamano
Link
1
.
5
.
0
.
1 docu
m
e
n
t
at
i
on
f
rom the main page
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-20
Junio
C
H
a
m
ano
git-
a
pply: requ
i
re
-
p
<
n> when
w
orking in a
subd
i
rectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-20
Junio
C
Hamano
git-apply: do
n
ot
lose cwd w
h
en run from a subdirector
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-20
Juni
o
C
Hamano
Merge branch 'js/diff-color-c
h
eck
'
commit
|
commitdiff
|
tree
2007-02-20
Ju
n
io
C Hamano
Merge branch 'jc/fe
t
ch-notags'
commit
|
commitdiff
|
tree
2007-02-20
Junio
C Ha
m
ano
Mer
g
e b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-02-19
Ju
n
i
o
C Hamano
Merg
e
branc
h
'
ap/cvsserve
r
'
commit
|
commitdiff
|
tree
2007-02-19
Junio C Ha
m
a
no
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-02-19
J
unio
C
Ha
m
a
no
GIT 1
.
5
.
0
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-18
Junio C Haman
o
Teach 'g
i
t
a
pply' to look
at $H
O
ME/
.
gitconfig even
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-18
Junio C Hama
n
o
U
p
date draft release n
o
t
e
s for 1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-18
Jun
i
o
C
H
am
a
no
Merge b
r
anch
'
maint'
commit
|
commitdiff
|
tree
2007-02-18
Juni
o
C Hamano
U
pdate
d
raft release
n
ote
s
for 1
.
5
.
0
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next