repo.or.cz
/
git
/
gitweb.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-02-28
Junio C Hamano
Merge
b
ra
n
ch 'js/c
o
mmit-by-
n
ame'
commit
|
commitdiff
|
tree
2007-02-28
Jun
i
o C
H
amano
Merge b
r
anch 'js/b
u
n
dle
'
commit
|
commitdiff
|
tree
2007-02-28
Junio C H
a
m
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-02-28
Jun
i
o C
H
amano
S
t
art preparing
Release
N
otes for
1
.
5
.
0
.
3
commit
|
commitdiff
|
tree
2007-02-28
Junio C H
a
m
a
no
Documentatio
n
: git-r
e
m
o
te ad
d
[-t <bra
n
c
h>] [-m <br
a
nch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Junio
C Hamano
in
d
ex_f
d
(): convert blob only
i
f
it is a
regular file
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Junio C Ha
m
a
n
o
inde
x
_fd():
pa
s
s optional pat
h
parame
t
er
as hint for
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Junio
C Hamano
index_
f
d(): use enum object_
t
ype i
n
stead of type name
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Junio C Ha
m
a
no
M
er
g
e
b
ranch 'n
p
/t
y
pes'
commit
|
commitdiff
|
tree
2007-02-28
J
u
nio C
Hamano
builtin-fetch--tool: ma
k
e
sure not to overstep
l
s-
r
em
o
t
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
M
e
rg
e
branch 'mc/
s
endmail'
commit
|
commitdiff
|
tree
2007-02-28
J
unio C Hamano
Me
r
ge branch 'js/diff-ni' (early part)
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
Merg
e
br
a
nch
'maint'
commit
|
commitdiff
|
tree
2007-02-28
Junio
C
Ham
a
n
o
fetch--tool:
f
i
x u
n
ini
t
ialized buffer when read
i
n
g
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-27
J
unio
C
H
amano
Make
'
c
vs ci'
lock
l
ess in git-cvsse
r
ver by usin
g
gi
t
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-27
Junio C H
a
mano
b
uiltin-fetch--tool
:
a
d
just to updated s
h
a1_o
b
ject_in
f
o()
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-27
J
u
nio C
H
amano
Merg
e
branch 'np/types' into jc/fe
t
ch
commit
|
commitdiff
|
tree
2007-02-27
Junio C Hamano
Merge
bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-02-27
J
u
n
i
o
C Hamano
gi
t
-apply: do not fix white
s
paces on
co
n
te
x
t lines
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
Ju
n
io C
Hamano
M
e
rge
b
r
a
nch 'master'
in
t
o js/
d
iff-ni
commit
|
commitdiff
|
tree
2007-02-26
J
u
nio
C
Hamano
Docum
e
nt
a
tion: link
i
n 1
.
5
.
0
.
2
material t
o
the top
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
Junio C Hamano
Merge bran
c
h
'maint
'
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 Ha
m
ano
Documentati
o
n: des
c
ribe "-f/-t/-m" opt
i
ons to "git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
Junio C H
a
mano
di
f
f -
-
c
c
: fix display of symlink conflic
t
s d
u
ring
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
Junio
C Hamano
Merge br
a
nch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-02-26
Junio C H
a
mano
Merg
e
branch 'jc/merge-symlink' into maint
commit
|
commitdiff
|
tree
2007-02-26
J
u
nio
C
Ha
m
ano
merge-recursi
v
e: fix long
s
tandi
n
g
bug
in me
r
g
i
ng sy
m
links
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
Junio C
H
amano
me
r
g
e-index: fix longstanding bug in merging symlinks
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-25
Junio C Hamano
diff --cac
h
ed:
g
ive mor
e
sensible error message
when
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-25
J
u
nio C
H
amano
M
e
rge
bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-02-25
Junio
C
Hamano
Add Rel
e
ase Notes to p
r
epare for 1
.
5
.
0
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-25
Junio
C
Hamano
rere
r
e:
d
o
n
ot deal with symlinks
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-25
Junio C Hamano
r
erere: do not skip tw
o
conflicted paths next t
o
each
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-25
Juni
o
C Hamano
M
erge
g
it
:
//repo
.
or
.
cz/git-gui into
m
aint
commit
|
commitdiff
|
tree
2007-02-25
Junio C Hamano
Don't modify CREDITS-FILE i
f
i
t hasn't cha
n
ged
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-24
Junio
C
H
a
mano
gi
t
-fetch-
-
tool takes flags before the
subcommand
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-24
Junio
C
Hamano
Evil Merge bra
n
ch 'jc/status'
(
earl
y
par
t
) into js
.
.
.
commit
|
commitdiff
|
tree
2007-02-24
Junio C
H
a
m
ano
Merge branch
'
js/apply'
commit
|
commitdiff
|
tree
2007-02-24
Junio C Hama
n
o
Merge b
r
an
c
h
'
js/no-limit-bounda
r
y'
commit
|
commitdiff
|
tree
2007-02-24
J
u
nio C
H
a
mano
Mer
g
e
bra
n
ch 'js/etc-config'
commit
|
commitdiff
|
tree
2007-02-24
Juni
o
C Hamano
Merge bra
n
c
h
'main
t
'
commit
|
commitdiff
|
tree
2007-02-24
J
u
n
i
o C
Hamano
diff
-
patch: Avo
i
d em
i
ttin
g
double-slashes in
t
ex
t
ual
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-24
Ju
n
io C Hamano
bun
d
l
e
:
rew
o
rd miss
i
ng prerequisite error
m
es
s
age
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-24
Junio C
Hama
n
o
Rewo
r
d git-am 3
-
way fallback failure
m
essage
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-23
Junio C Hamano
.
m
ailmap ma
i
nten
a
n
ce after pulling from
g
it-svn
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-23
Jun
i
o C H
a
mano
Merge branches '
l
t/crlf' and 'jc/apply-co
n
f
i
g
'
commit
|
commitdiff
|
tree
2007-02-23
Junio C Hamano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2007-02-22
Jun
i
o C
H
amano
run_diff_{fi
l
es,index}(): updat
e
calling co
n
v
en
t
ion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-22
Junio C H
a
mano
update-index: do no
t
die too early in a read-only reposi
t
ory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-22
Junio C
H
ama
n
o
git-
s
tatus: do
not be totall
y
u
s
eless in a read-
o
nly
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-22
Junio C Hamano
t4119:
test au
t
oc
o
m
p
uti
n
g
-p<n> for traditional diff
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-22
Junio
C
H
amano
git-apply: gue
s
s
cor
r
ect
-
p
<n> va
l
ue for non-git patches
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-21
Ju
n
io
C
H
aman
o
git-a
p
ply: notice "diff --git
"
patch a
g
ain
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-21
Jun
i
o C Ha
m
ano
Mer
g
e br
a
nch 'main
t
'
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hamano
Merg
e
branch 'maste
r
' of git
:
//re
p
o
.
or
.
cz/git-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hamano
Fix
b
otch
e
d "leak fix"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Haman
o
t4119: add test for tr
a
ditiona
l
p
atch and dif
f
erent
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hamano
Merge
branch
'fk/a
u
toconf'
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hamano
M
e
rge
b
r
a
nch 'js/name-rev-fix'
commit
|
commitdiff
|
tree
2007-02-21
Junio
C
Hamano
prefixcmp(): fix-u
p
leftover strncmp()
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-21
Jun
i
o C Hamano
prefixcmp(
)
:
f
i
x
-
up me
c
h
anical conver
s
ion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-21
J
u
nio C Hamano
Mechanical conver
s
ion to use prefixcmp()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-21
Junio
C
Hamano
Add
p
refixcmp
(
)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hamano
M
erge br
a
n
c
h '
m
aint'
commit
|
commitdiff
|
tree
2007-02-20
Junio C Hamano
L
ink
1
.
5
.
0
.
1 do
c
umentation from th
e
m
a
i
n pa
g
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-20
Juni
o
C
H
ama
n
o
gi
t
-
apply: requ
i
re -p<n> when working
in a su
b
d
irect
o
ry
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-20
Junio C
Hamano
git
-
app
l
y: do not lose cwd when run from
a
subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-20
Junio C H
a
mano
Merge branch 'js/di
f
f-color-check'
commit
|
commitdiff
|
tree
2007-02-20
Junio C
H
amano
Merge branc
h
'jc/fe
t
ch-nota
g
s'
commit
|
commitdiff
|
tree
2007-02-20
Junio C
H
amano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-02-19
Juni
o
C Ham
a
n
o
Mer
g
e br
a
nch 'a
p
/
cv
s
server'
commit
|
commitdiff
|
tree
2007-02-19
Junio C Ham
a
no
M
erge
branc
h
'm
a
int'
commit
|
commitdiff
|
tree
2007-02-19
Juni
o
C
Hamano
GIT 1
.
5
.
0
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-18
Junio
C
Hama
n
o
Teach 'git
apply' to
l
ook at $HO
M
E/
.
git
c
on
f
ig eve
n
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-18
J
unio
C
Haman
o
U
p
date draft r
e
lease
n
otes for 1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-18
J
unio C Hamano
M
erge
bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-02-18
Jun
i
o
C
Ha
m
ano
U
pdate draft release n
o
t
es fo
r
1
.
5
.
0
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-18
Junio C Hamano
Mer
g
e
g
it://git
.
kernel
.
org/pub/scm/gitk/gitk
i
nto m
a
in
t
commit
|
commitdiff
|
tree
2007-02-17
J
u
n
i
o
C
Hamano
Teach co
r
e
.
a
utocrlf to
'
git
a
pply'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-17
Junio
C
Hamano
T
e
a
ch 'git
a
pply'
t
o l
o
ok at $GIT
_
DIR/co
n
fig
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-17
Ju
n
io C H
a
mano
Do
n
o
t
t
ake mode bit
s
f
r
om index after
type change
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-16
Junio C
Hamano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2007-02-16
Junio C
Hamano
git-
m
e
rge:
m
inor
fix for
n
o_tri
v
ial_merg
e
_strat
e
g
ies
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-16
Ju
n
io C Hamano
Mer
g
e br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-02-16
Junio C Hamano
pretend-sha1: g
r
ave bugfix
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-15
J
unio C Hamano
remote
s
.
not-origin
.
tagopt
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-14
Jun
i
o C Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-02-14
J
unio C Hamano
GIT
-
VERS
I
ON-FILE:
c
h
eck
.
/version first
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
t00
2
0:
a
dd t
e
st for auto-cr
l
f
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-14
J
unio C Hamano
[PAT
C
H] gitk: Use s
h
ow-ref inst
e
ad o
f
ls-remote
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-14
Jun
i
o C
H
amano
[PAT
C
H] M
a
ke git
k
w
o
r
k
reasonably
w
ell on Cy
g
win
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hama
n
o
Ma
k
e sure pa
c
kedgitwindo
w
size
i
s multiple o
f
(pagesize
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-14
J
u
n
i
o C Hamano
Add RelNotes 1
.
5
.
0
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-14
Junio C
Hamano
Still updating 1
.
5
.
0 rele
a
se note
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
Clarify two b
a
ckward incomp
a
tible repository options
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
Poin
t
top-lev
e
l RelNotes link
a
t 1
.
5
.
1 rele
a
se notes
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-14
Junio C
H
am
a
no
Add RelNotes 1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-14
J
un
i
o
C
Hamano
Docu
m
ent --igno
r
e-space-at-eol
option
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-14
Jun
i
o C H
a
mano
Merge branch
'
m
aint'
commit
|
commitdiff
|
tree
next