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 Hamano
Merge branch 'js/revert-cherry'
commit
|
commitdiff
|
tree
2007-03-11
Junio
C
Hamano
Merge branch 'sp/m
a
ke'
commit
|
commitdiff
|
tree
2007-03-11
J
unio C Ham
a
n
o
Merg
e
bra
n
ch
'ma
i
nt
'
commit
|
commitdiff
|
tree
2007-03-11
Ju
n
io C Hama
n
o
Merge br
a
nch 'maint' of git://l
i
nux-nfs
.
o
r
g/~bfields
.
.
.
commit
|
commitdiff
|
tree
2007-03-08
Junio C
Hamano
M
e
rge branch
'
js/config-rename'
commit
|
commitdiff
|
tree
2007-03-08
Junio C Ha
m
a
n
o
Merge br
a
nch
'master'
of git://repo
.
or
.
cz/git/fas
t
import
commit
|
commitdiff
|
tree
2007-03-07
Junio C Ham
a
no
Me
r
g
e branch 'maint'
commit
|
commitdiff
|
tree
2007-03-06
Junio C Hamano
M
e
rge branch
'
maint'
commit
|
commitdiff
|
tree
2007-03-06
Junio C Hamano
Merge branch 'maste
r
' of
git:/
/
repo
.
or
.
cz
/
gi
t
-
gui into
.
.
.
commit
|
commitdiff
|
tree
2007-03-06
Junio C
H
amano
git-bundle: fi
x
pa
c
k generation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-06
J
u
nio C Hamano
Merge bran
c
h
'maint'
commit
|
commitdiff
|
tree
2007-03-06
J
u
n
io C Hamano
git-commit: cd
to
t
op before showing the fina
l
stat
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-06
Junio C Hamano
M
erge branc
h
'mas
t
e
r
-
f
o
r
-junio' of gi
t
:/
/
repo
.
or
.
c
z
.
.
.
commit
|
commitdiff
|
tree
2007-03-06
Junio C
Hamano
Merge
br
a
nch 'maint-for-junio' of git://repo
.
or
.
cz
.
.
.
commit
|
commitdiff
|
tree
2007-03-05
J
unio
C
Hamano
Post 1
.
5
.
0
.
3 cle
a
n
up
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-05
Ju
n
io C Hamano
Merge branch 'js/fet
c
h-p
r
ogr
e
s
s' (earl
y
p
art)
commit
|
commitdiff
|
tree
2007-03-05
Ju
n
i
o
C Hamano
Mer
g
e branch 'js
/
symlink'
commit
|
commitdiff
|
tree
2007-03-05
Junio C Ham
a
no
Merg
e
b
ranch 'm
a
i
n
t'
commit
|
commitdiff
|
tree
2007-03-05
Juni
o
C Hamano
GIT 1
.
5
.
0
.
3
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-04
Jun
i
o
C Hamano
diff-ni: al
l
ow ru
n
ning from a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-04
Jun
i
o C
H
amano
Merge branch 'j
s
/
di
f
f-ni' (early part
)
commit
|
commitdiff
|
tree
2007-03-04
J
unio C
Hamano
Merge
b
r
anch 'main
t
'
commit
|
commitdiff
|
tree
2007-03-03
Junio
C
Hamano
git-merge:
fail cor
r
ectly when we
ca
n
not f
a
st forward
.
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
M
erge
b
r
anch 'js/com
m
it-format'
commit
|
commitdiff
|
tree
2007-03-02
J
u
n
i
o
C Hamano
M
e
r
g
e
b
r
a
nch
'
maint'
commit
|
commitdiff
|
tree
2007-02-28
Junio C Haman
o
Add recent ch
a
nges
t
o dr
a
ft 1
.
5
.
1
release notes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Junio
C
H
amano
Mer
g
e
branc
h
'js/
c
om
m
it
-
by-name'
commit
|
commitdiff
|
tree
2007-02-28
J
u
nio C Hamano
Merge br
a
nch
'js/bundle'
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
Merg
e
branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-02-28
Jun
i
o
C
Hamano
Sta
r
t
preparing Release Notes for
1
.
5
.
0
.
3
commit
|
commitdiff
|
tree
2007-02-28
J
unio C Hamano
D
o
cumentation: git
-
remote add
[
-t
<b
r
anch>] [-m <branch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Jun
i
o
C
H
a
m
a
n
o
index_fd(): convert blob on
l
y if it i
s
a regu
l
ar file
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Junio C
H
aman
o
i
n
d
ex_fd(): pass optional path param
e
ter as hint for
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
J
un
i
o C Hamano
index_fd(): use enum object_type instead of type
n
am
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-28
Junio C H
a
mano
Merge b
r
a
n
ch 'np/type
s
'
commit
|
commitdiff
|
tree
2007-02-28
Junio C Ha
m
ano
Merge branch 'm
c
/sendmail'
commit
|
commitdiff
|
tree
2007-02-28
Junio C Haman
o
Merge bra
n
ch 'js/diff-ni' (earl
y
p
ar
t
)
commit
|
commitdiff
|
tree
2007-02-28
Junio
C
H
a
m
ano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2007-02-27
Junio
C
Hamano
M
ake 'cvs ci' l
o
ckless i
n
git-cv
s
server by usi
n
g g
i
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-27
Junio C Ham
a
n
o
Merge br
a
nch '
m
aint'
commit
|
commitdiff
|
tree
2007-02-27
Junio
C H
a
mano
git-a
p
ply: do not fix whitesp
a
ces on con
t
ext lines
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Juni
o
C
Ha
m
ano
Me
r
g
e bran
c
h 'mast
e
r'
into js/diff
-
n
i
commit
|
commitdiff
|
tree
2007-02-26
Junio C Haman
o
Docu
m
ent
a
tion: link in 1
.
5
.
0
.
2
m
a
te
r
ial to the to
p
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
J
u
nio C Ham
a
n
o
Mer
g
e
bra
n
ch 'm
a
int'
commit
|
commitdiff
|
tree
2007-02-26
Junio
C Hamano
GIT
1
.
5
.
0
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Junio C
H
amano
Do
c
umentation: describe "-f/-t/-m" options to "git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Juni
o
C Hamano
diff --cc: fix disp
l
ay of symlink conflicts during
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
J
u
nio C Hama
n
o
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2007-02-26
J
u
nio C Hamano
M
e
rge branch 'jc/merge-sym
l
ink' into m
a
int
commit
|
commitdiff
|
tree
2007-02-26
Junio C Ham
a
no
me
r
ge-recu
r
s
i
ve: fix longstanding
bug in
m
e
rgi
n
g symlinks
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Junio C
Ha
m
ano
merge-in
d
ex
:
fix longstanding
b
ug
i
n
mergin
g
symlinks
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio
C
H
a
m
ano
diff --cached: give more sensible err
o
r message when
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Juni
o
C Ha
m
ano
Me
r
g
e
b
ranch 'm
a
int'
commit
|
commitdiff
|
tree
2007-02-25
Junio C Hamano
Add Release Notes to prepare for 1
.
5
.
0
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio C H
a
mano
rerere:
d
o not dea
l
w
i
th symlinks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Ju
n
i
o C Hamano
rerere: do not skip two conflicted
p
a
th
s
next to each
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio C Hamano
Merge git://
r
e
p
o
.
or
.
cz
/
git-gui in
t
o maint
commit
|
commitdiff
|
tree
2007-02-25
Ju
n
io C Hama
n
o
D
on't
modify CRE
D
ITS-FILE if it hasn't changed
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
Junio
C
Hamano
E
vil Merge
b
r
a
n
c
h
'jc/status' (earl
y
part) i
n
t
o
j
s
.
.
.
commit
|
commitdiff
|
tree
2007-02-24
Junio C Hamano
Merg
e
branch
'js/apply'
commit
|
commitdiff
|
tree
2007-02-24
Junio C Hamano
Merge br
a
nch 'js
/
no-limit-boundary
'
commit
|
commitdiff
|
tree
2007-02-24
Junio C Hamano
Merge bran
c
h
'js/etc-config'
commit
|
commitdiff
|
tree
2007-02-24
Ju
n
io C Hamano
Merge br
a
n
ch
'
maint'
commit
|
commitdiff
|
tree
2007-02-24
Junio
C
Ham
a
no
diff-
p
atch: Av
o
id emitting double
-
slashes in
textual
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
Junio C Hamano
bundl
e
: reword mis
s
ing p
r
erequis
i
te e
r
r
o
r
mes
s
age
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
Ju
n
io
C
Hamano
Re
w
ord git-am
3
-way fallback failure
message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-23
Junio C Ha
m
ano
.
ma
i
lmap ma
i
ntenan
c
e a
f
t
e
r pulling
from git-svn
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-23
Junio C Hamano
Merge b
r
anches 'lt/crlf' and
'jc/appl
y
-conf
i
g'
commit
|
commitdiff
|
tree
2007-02-23
Junio C
H
amano
Merge
b
ran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-02-22
Junio
C
H
amano
run_diff
_
{files,index}(): update ca
l
l
i
n
g
convention
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
Ju
n
io C Hamano
u
pdate-
i
ndex:
do n
o
t
di
e
too
e
a
rly
i
n
a read-o
n
ly repository
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
Jun
i
o C Hama
n
o
gi
t
-
status: do
not be totally useles
s
i
n
a read-only
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
Junio C Hamano
t4119: t
e
st au
t
ocomputing -p<n> for traditional diff
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
Junio C Hamano
g
i
t-app
l
y: guess correc
t
-p<n> value for non-git pa
t
ch
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Junio
C Hamano
git-apply: notice "diff --git" patch ag
a
in
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Jun
i
o C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hamano
M
e
rg
e
b
r
an
c
h
'
master
'
of
g
it://repo
.
or
.
cz/g
i
t
-gui int
o
.
.
.
commit
|
commitdiff
|
tree
2007-02-21
Ju
n
io C Hamano
F
i
x botch
e
d "l
e
ak fix
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Jun
i
o
C
H
amano
t4
1
19: add test for traditional
p
atch and d
i
ff
e
rent
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Jun
i
o C Hamano
Merge branch 'fk/autocon
f
'
commit
|
commitdiff
|
tree
2007-02-21
Ju
n
io C Hamano
Merge
branch 'js/
n
ame-re
v
-fix'
commit
|
commitdiff
|
tree
2007-02-21
Junio
C
Ham
a
no
prefixcmp(): fix
-
up lefto
v
er strncmp()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Juni
o
C Hamano
prefixcmp(): fix-
u
p mechanical
c
onversion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
J
u
nio
C Ham
a
no
Mechanical
c
onversion to
us
e
prefixcmp()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Juni
o
C Hamano
A
d
d prefixcmp()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hamano
M
erge branch 'maint
'
commit
|
commitdiff
|
tree
2007-02-20
Jun
i
o C Ham
a
no
Link 1
.
5
.
0
.
1
d
oc
u
mentation from
t
he mai
n
pa
g
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-20
Junio C
H
a
mano
git-app
l
y: require -p<n> w
h
en workin
g
in a
s
ubdirecto
r
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-20
Junio
C
H
amano
git-
a
pply: d
o
n
o
t lose
c
wd wh
e
n run fr
o
m
a
su
b
directory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-20
Junio C Haman
o
Merg
e
b
r
a
nch 'j
s
/di
f
f
-
c
o
l
o
r-check
'
commit
|
commitdiff
|
tree
2007-02-20
Junio C
Ham
a
no
Merge branch 'jc/fetch
-
notags'
commit
|
commitdiff
|
tree
2007-02-20
Junio C Hamano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2007-02-19
Junio C H
a
mano
Merge branch 'ap/cvsserver'
commit
|
commitdiff
|
tree
2007-02-19
Junio C Hamano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2007-02-19
Junio C
H
amano
GI
T
1
.
5
.
0
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-18
Junio
C
Ha
m
ano
T
each 'git app
l
y
'
to look at $HOM
E
/
.
gitconf
i
g even
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-18
J
u
nio C Hama
n
o
Update draf
t
release notes f
o
r 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-18
Junio C
Ha
m
ano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-02-18
J
unio C Hamano
Update draft r
e
leas
e
n
o
tes for 1
.
5
.
0
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next