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 'maint'
2007-03-06
J
u
n
io C Hamano
Merge branch 'm
a
i
n
t
'
commit
|
commitdiff
|
tree
2007-03-06
Junio
C
Hama
n
o
git-co
m
mit: cd to top before s
h
owing the f
i
nal
s
tat
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-06
Juni
o
C
H
am
a
no
Mer
g
e
branch
'
ma
s
te
r
-
f
or-junio' of git://repo
.
or
.
cz
.
.
.
commit
|
commitdiff
|
tree
2007-03-06
Junio
C Hamano
Me
r
ge
b
ranch 'maint
-
for-juni
o
' of gi
t
://repo
.
or
.
cz
.
.
.
commit
|
commitdiff
|
tree
2007-03-05
J
unio C Ham
a
no
Post 1
.
5
.
0
.
3 cleanup
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-05
J
u
n
io C
H
aman
o
Merge bran
c
h 'js/fetch-progress' (
e
arly part
)
commit
|
commitdiff
|
tree
2007-03-05
Junio C Hamano
Merg
e
branch 'js/symlink'
commit
|
commitdiff
|
tree
2007-03-05
Junio
C
H
a
mano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-03-05
J
u
nio C Hamano
GI
T
1
.
5
.
0
.
3
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-04
Junio
C
Hamano
diff-ni
:
allow runnin
g
from
a sub
d
irec
t
ory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-04
Junio C Hamano
M
e
r
g
e
b
ranch 'js/di
f
f-ni' (early
p
art)
commit
|
commitdiff
|
tree
2007-03-04
J
u
nio C Hamano
Me
r
ge br
a
nch
'
maint'
commit
|
commitdiff
|
tree
2007-03-03
Jun
i
o C
Hamano
git-merge: fa
i
l
c
o
rrec
t
ly w
h
e
n
we ca
n
n
ot f
a
st
f
orward
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-03
Junio C Hamano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-03-02
Junio C Hamano
Merge bran
c
h 'js/
c
om
m
i
t
-fo
r
mat'
commit
|
commitdiff
|
tree
2007-03-02
J
u
n
io
C Ham
a
no
Mer
g
e
b
ranch 'maint'
commit
|
commitdiff
|
tree
2007-02-28
Juni
o
C
H
amano
Add recent
changes to d
r
aft
1
.
5
.
1 release notes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
Merge bran
c
h 'js/commi
t
-by-name'
commit
|
commitdiff
|
tree
2007-02-28
Junio C Ha
m
ano
Merge branc
h
'js/b
u
n
dle'
commit
|
commitdiff
|
tree
2007-02-28
Junio C H
a
mano
Me
r
ge
b
r
anch 'm
a
int'
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
Star
t
p
r
eparing
Relea
s
e Notes for 1
.
5
.
0
.
3
commit
|
commitdiff
|
tree
2007-02-28
Junio C
H
ama
n
o
Documenta
t
ion
:
git-remot
e
add [-t <branch
>
] [-m <branch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Junio C H
a
mano
in
d
ex_fd
(
):
con
v
ert blob only
if it is a reg
u
lar file
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
J
unio C Hamano
index_fd():
p
as
s
optional p
a
th parameter as h
i
nt for
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Junio C Ha
m
ano
inde
x
_fd():
u
se e
n
u
m object_type instead o
f
t
ype name
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Junio C Ha
m
a
n
o
Merge b
r
anch
'
np/types'
commit
|
commitdiff
|
tree
2007-02-28
Junio C Ha
m
ano
Merge bran
c
h
'mc
/
s
e
n
dmai
l
'
commit
|
commitdiff
|
tree
2007-02-28
Junio C Ham
a
n
o
Merge b
r
anch 'js/diff-ni' (early p
a
rt)
commit
|
commitdiff
|
tree
2007-02-28
Junio C H
a
ma
n
o
M
e
r
ge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-02-27
Junio C Hamano
Mak
e
'cvs
c
i' lockless in
g
i
t-cv
s
server by using
g
i
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-27
J
unio C Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2007-02-27
Ju
n
io
C
Hamano
gi
t
-apply
:
do not fix whitespaces on co
n
text lines
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Junio C
Ham
a
no
Merge branch '
m
as
t
er' in
t
o js/d
i
ff-ni
commit
|
commitdiff
|
tree
2007-02-26
Junio
C
H
a
mano
Documenta
t
ion: link in 1
.
5
.
0
.
2 ma
t
erial to
the top
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Ju
n
io C H
a
m
a
n
o
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2007-02-26
Ju
n
io C Hamano
GIT 1
.
5
.
0
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Junio C Hama
n
o
Docu
m
e
ntation: de
s
cribe
"-f/-t/-m" o
p
t
i
ons to
"
git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Ju
n
io
C
Hamano
d
i
f
f
--cc: fix di
s
p
lay of symlink
conflicts durin
g
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Juni
o
C Hamano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-02-26
Junio C Hamano
Merg
e
branch 'j
c
/merge-symlink'
into m
a
in
t
commit
|
commitdiff
|
tree
2007-02-26
Junio C
H
a
ma
n
o
me
r
ge
-
recursive: fix lon
g
standin
g
bug in merging symlinks
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Juni
o
C Hamano
merge
-
index:
f
ix longs
t
anding bu
g
i
n
merging symlinks
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
J
unio C H
a
mano
d
if
f
-
-
cac
h
e
d: give more s
e
n
s
i
ble e
r
ro
r
message when
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio
C
Hamano
Merge
branch 'm
a
i
nt'
commit
|
commitdiff
|
tree
2007-02-25
J
unio C
Ham
a
no
Add Release Not
e
s to prepare 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 not deal w
i
th syml
i
n
k
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio C Ha
m
ano
rerere: do not skip two
c
on
f
licted
paths next to eac
h
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio
C
Hamano
Merge git:
/
/r
e
po
.
or
.
cz/git-g
u
i
into maint
commit
|
commitdiff
|
tree
2007-02-25
Junio C Haman
o
Don't modify CR
E
DITS-FILE if it hasn't
c
h
a
n
ged
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
Jun
i
o C Hamano
Evil Merge
b
r
a
n
ch 'jc/status' (
e
arly
part) i
n
to js
.
.
.
commit
|
commitdiff
|
tree
2007-02-24
J
u
nio C Hamano
Merge branch
'js/apply
'
commit
|
commitdiff
|
tree
2007-02-24
J
u
nio C H
a
m
a
no
M
erge branch '
j
s/n
o
-limit-bo
u
ndary
'
commit
|
commitdiff
|
tree
2007-02-24
Jun
i
o C Hama
n
o
Merge branc
h
'j
s
/et
c
-config'
commit
|
commitdiff
|
tree
2007-02-24
Junio
C Ha
m
ano
Merge
b
ranch
'maint'
commit
|
commitdiff
|
tree
2007-02-24
Junio
C Hamano
diff-pat
c
h: Avoid emitti
n
g double-
s
la
s
hes
i
n
textual
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
Junio C H
a
mano
bundle: reword missing prerequ
i
site error messag
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
Ju
n
io C Hamano
Reword git-am 3-way fal
l
back
f
ailu
r
e
me
s
sag
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-23
Junio C
H
amano
.
mail
m
ap mainten
a
n
c
e after pulling f
r
om git-svn
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-23
Junio
C
H
a
mano
Merge bran
c
hes 'lt/crlf' and 'jc/apply-config'
commit
|
commitdiff
|
tree
2007-02-23
Junio C Hamano
Merge
b
r
anc
h
'ma
i
nt'
commit
|
commitdiff
|
tree
2007-02-22
Junio C Hamano
run_diff_{
f
iles,index}(
)
: update
c
alling c
o
nvention
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
Junio
C Hamano
update-inde
x
: do not die too
early in
a
read-
o
nl
y
repository
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
Junio C
H
a
man
o
g
i
t
-status:
d
o
n
o
t b
e
t
otally useless in a
r
ead-only
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
Ju
n
i
o
C Ham
a
no
t4119: test auto
c
omp
u
ting -p<n> f
o
r t
r
aditiona
l
diff
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
Junio C
H
ama
n
o
git-a
p
ply: guess cor
r
ect -p
<
n> valu
e
for non-git patches
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Junio C H
a
man
o
git-apply:
n
o
tice "
d
iff --git
"
p
atch a
g
ain
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-02-21
Junio C
Hamano
Merge
b
ranch 'master'
of g
i
t:
/
/
re
p
o
.
or
.
cz/git-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-02-21
J
un
i
o C
H
amano
F
i
x
botched "leak
fix"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Ham
a
n
o
t4119:
add t
e
s
t for traditio
n
al patch and different
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hamano
Merge
b
ranc
h
'fk/autoconf'
commit
|
commitdiff
|
tree
2007-02-21
Junio
C Hamano
Merge
b
ranch 'js/nam
e
-rev-fi
x
'
commit
|
commitdiff
|
tree
2007-02-21
Ju
n
i
o
C
Hama
n
o
p
refixcmp(): fix-u
p
left
o
ver strnc
m
p(
)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Ju
n
io C Hamano
pref
i
xcmp(): fix-up mechanical con
v
ersio
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
J
unio C Haman
o
Mechanic
a
l
conversi
o
n to use prefixcmp()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hamano
Add p
r
efixcmp(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Jun
i
o C Hamano
M
e
rge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-02-20
Junio
C H
a
m
a
no
Link
1
.
5
.
0
.
1
documenta
t
i
o
n
f
rom t
h
e
main page
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-20
J
unio C
H
a
ma
n
o
git-
a
pply
:
requ
i
r
e
-p<n
>
when working in
a
s
u
b
d
irectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-20
Junio C
H
a
m
a
n
o
gi
t
-ap
p
l
y:
d
o
n
o
t l
o
se cwd
when run
f
rom a subdirector
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-20
Jun
i
o C Haman
o
Merge bra
n
ch 'js/diff-color-ch
e
ck'
commit
|
commitdiff
|
tree
2007-02-20
Junio C Hamano
Merge branch 'jc
/
fet
c
h-no
t
ags'
commit
|
commitdiff
|
tree
2007-02-20
Junio C Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-02-19
Junio
C Ham
a
no
M
erge branch 'ap/cvss
e
r
v
er'
commit
|
commitdiff
|
tree
2007-02-19
Jun
i
o C Ham
a
no
Merg
e
b
ranch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-02-19
Junio C
Hamano
G
I
T
1
.
5
.
0
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-18
Juni
o
C
H
ama
n
o
Teach 'git appl
y
' t
o
look
at $HOME/
.
gitconfi
g
even
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-18
Junio C Hamano
Update draft release notes f
o
r
1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-18
Ju
n
io C Hamano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2007-02-18
Junio C Ham
a
no
Update draft
r
el
e
ase no
t
e
s
for 1
.
5
.
0
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-18
Juni
o
C H
a
mano
M
e
rge
git://git
.
ke
r
nel
.
or
g
/pu
b
/scm/gitk/gitk i
n
to maint
commit
|
commitdiff
|
tree
2007-02-17
Ju
n
io C Hama
n
o
Teach
core
.
autocrl
f
to 'git apply'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-17
J
unio C Hamano
Tea
c
h 'gi
t
a
pply'
t
o look at
$
GIT_D
I
R
/
config
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-17
Junio C Hamano
Do
not take
m
ode
bits
from index after type change
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-16
Junio C Hamano
Me
r
ge branch
'maint'
commit
|
commitdiff
|
tree
2007-02-16
Junio C Hamano
git-merge: minor fix for
n
o_t
r
ivial_m
e
rge_
s
trategies
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-16
Junio C H
a
mano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2007-02-16
Junio C Hamano
pre
t
end-sha1: gr
a
ve
bugfix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-15
Junio C Hamano
r
e
mo
t
es
.
not-o
r
igin
.
tagopt
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
J
u
n
i
o C Hamano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
next