repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'fl/cvsserver'
2007-03-04
Junio C Hamano
.
gitig
n
or
e
: add
g
it-
f
etch--tool
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-04
Ju
n
io C Hamano
diff-ni: fix the
diff
w
i
t
h standard inpu
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-04
Junio C Hama
n
o
diff-ni: a
l
l
o
w
running from
a subdirector
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-04
Junio C Hamano
Merge branch '
j
s/diff-ni'
(earl
y
pa
r
t)
commit
|
commitdiff
|
tree
2007-03-04
Junio C Hamano
Merge branch
'
main
t
'
commit
|
commitdiff
|
tree
2007-03-03
Junio C Hamano
git-me
r
ge:
fail c
o
rrectl
y
when we ca
n
n
o
t fast forw
a
rd
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-03
Junio C Hamano
M
e
rge b
r
anch 'mai
n
t
'
commit
|
commitdiff
|
tree
2007-03-02
Junio C Hamano
Merge b
r
a
n
c
h 'js/commit-forma
t
'
commit
|
commitdiff
|
tree
2007-03-02
Junio
C Hama
n
o
Merge
b
r
anc
h
'
m
aint'
commit
|
commitdiff
|
tree
2007-03-01
Ju
n
io
C
Hamano
bu
i
lti
n
-fet
c
h--tool: fix r
e
flog notes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-01
Junio C Ha
m
ano
git-fetch: re
t
ire update-local-re
f
which
i
s
not us
e
d
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Junio C
H
amano
A
d
d recent cha
n
ges to dra
f
t
1
.
5
.
1 release notes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
Merge branch 'js
/
co
m
mit-by-na
m
e'
commit
|
commitdiff
|
tree
2007-02-28
Ju
n
io C Hamano
Merg
e
bra
n
ch 'js/bun
d
le'
commit
|
commitdiff
|
tree
2007-02-28
Junio C Haman
o
Merge b
r
an
c
h '
m
aint'
commit
|
commitdiff
|
tree
2007-02-28
Juni
o
C Hamano
Start pr
e
paring
Release
Note
s
for 1
.
5
.
0
.
3
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
Docume
n
tation: g
i
t-remote add [-t <branch
>
]
[-m
<
branch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Jun
i
o C Hamano
index_fd(): convert blo
b
o
n
ly if it is a regu
l
ar file
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Juni
o
C Hamano
in
d
e
x
_
fd():
p
ass optiona
l
path par
a
met
e
r as hint for
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Junio
C
Hamano
index_fd(): use enum ob
j
ect_ty
p
e
i
ns
t
ead o
f
type name
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Juni
o
C H
a
m
a
no
Merge bran
c
h 'np
/
types
'
commit
|
commitdiff
|
tree
2007-02-28
Junio C
H
amano
bui
l
tin-f
e
tch--tool: make sure no
t
to overstep ls-
r
emote
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-28
Junio C Haman
o
Mer
g
e bran
c
h
'
mc/sendma
i
l'
commit
|
commitdiff
|
tree
2007-02-28
Junio
C
Hamano
M
e
rge br
a
n
c
h 'js/dif
f
-ni' (e
a
rly part)
commit
|
commitdiff
|
tree
2007-02-28
Juni
o
C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-02-28
Junio
C
Hamano
f
e
t
c
h
--tool: fix uniniti
a
lized buffer when re
a
ding
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-27
Junio
C Hamano
Make
'
cvs ci' lockle
s
s
in git-cvsserver by u
s
i
ng git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-27
Ju
n
io C Haman
o
b
u
iltin-fetch--
t
ool
:
a
d
just
to updat
e
d sha1_ob
j
e
c
t
_
i
nfo
(
)
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-27
Junio C
Hamano
Merge branch 'np/types' into jc/fe
t
ch
commit
|
commitdiff
|
tree
2007-02-27
Junio C Hamano
M
erge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-02-27
Junio C Hamano
git
-
a
p
ply
:
do no
t
f
ix whitespac
e
s on context lin
e
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
Junio C Hamano
Merge branch 'master' into js/diff-ni
commit
|
commitdiff
|
tree
2007-02-26
Junio C Hamano
Docum
e
ntation: link in
1
.
5
.
0
.
2 mate
r
ial to the to
p
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
Junio C Hamano
M
e
rg
e
branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-02-26
Ju
n
io C Hamano
G
IT 1
.
5
.
0
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
Junio C Hamano
Docume
n
tation:
desc
r
i
be "-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
m
ano
d
iff
-
-cc:
f
ix
display of
symlink co
n
flicts duri
n
g
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
Junio
C
Ha
m
a
n
o
M
er
g
e
b
ranch 'maint
'
commit
|
commitdiff
|
tree
2007-02-26
Juni
o
C Hama
n
o
Merge
bran
c
h
'
jc/merge-symlink' i
n
to maint
commit
|
commitdiff
|
tree
2007-02-26
Junio C Hamano
me
r
ge-r
e
cursive: fix
l
ongstanding
b
ug in mer
g
ing symlink
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-26
Ju
n
io C Hamano
merge-index: fix longstandi
n
g bug in merg
i
ng symli
n
k
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-25
Ju
n
io
C
Ham
a
no
diff --cached: gi
v
e
more sensible e
r
ror
m
essage when
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-25
Junio C Hamano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2007-02-25
Ju
n
i
o
C Hamano
Add
R
elease Notes to prepare
f
or 1
.
5
.
0
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-25
Junio
C
Ham
a
no
r
erer
e
:
d
o
no
t
deal with
symlinks
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-25
Junio
C Haman
o
r
erere: d
o
not skip
t
wo conflicte
d
paths next to each
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-25
Junio C Ha
m
ano
Merge gi
t
://repo
.
o
r
.
c
z/git-gui i
n
to maint
commit
|
commitdiff
|
tree
2007-02-25
Junio
C
Hamano
Don't mo
d
ify CREDITS-
F
ILE if it hasn't changed
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-24
Junio C Hamano
git-
f
etch--t
o
ol take
s
flags befo
r
e the
s
ubcomman
d
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-24
Junio C Haman
o
Evil Merge branch 'jc
/
stat
u
s' (early
p
art) into js
.
.
.
commit
|
commitdiff
|
tree
2007-02-24
Junio C Hamano
Me
r
g
e branch
'j
s
/
a
p
p
ly
'
commit
|
commitdiff
|
tree
2007-02-24
Junio C
H
amano
Mer
g
e bra
n
ch
'
js/no-limit-boundary'
commit
|
commitdiff
|
tree
2007-02-24
Ju
n
io
C H
a
m
a
no
Merge branch
'js/etc-config'
commit
|
commitdiff
|
tree
2007-02-24
Jun
i
o C Hamano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2007-02-24
Junio C Ha
m
a
no
di
f
f-patch: Avo
i
d emitting double-slashes in textual
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-24
Junio C Hamano
bun
d
le:
r
eword m
i
ssing prerequisit
e
e
r
r
o
r m
e
s
s
age
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-24
Ju
n
io C Hamano
Rew
o
rd
g
it-am 3-wa
y
fallback failu
r
e mess
a
ge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-23
Junio C H
a
mano
.
mail
m
ap mai
n
tenance after pulling from gi
t
-svn
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-23
Junio C Haman
o
Mer
g
e branches 'l
t
/crlf' and 'jc/apply-config'
commit
|
commitdiff
|
tree
2007-02-23
Ju
n
io
C
Hamano
Merge br
a
nch
'maint'
commit
|
commitdiff
|
tree
2007-02-22
Junio
C
H
amano
run_diff
_
{files,i
n
de
x
}(): upd
a
t
e
calling convention
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-22
Junio C
H
amano
update-
i
ndex: do not die to
o
early in
a
r
ea
d
-only rep
o
sitory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-22
J
u
nio
C
H
a
man
o
g
it-s
t
atus: d
o
not be
t
otally useless in a re
a
d-
o
nly
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-22
Junio C Hama
n
o
t
4
119: test autocomputing
-p<n> for tra
d
itional diff
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-22
Juni
o
C Ham
a
no
g
it
-
a
pp
l
y:
g
ue
s
s correct
-p<n
>
v
a
lue for non-git pat
c
hes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-21
Junio
C Hamano
g
it-
a
p
p
ly: n
o
tice "di
f
f --git" patch again
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-21
Ju
n
io C Hamano
Merge branch
'
ma
i
nt'
commit
|
commitdiff
|
tree
2007-02-21
J
u
n
io C H
a
mano
Merge branch 'master' of git://rep
o
.
or
.
cz/git-gui
into
.
.
.
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hama
n
o
F
i
x botched "leak f
i
x"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-21
Junio
C
H
a
ma
n
o
t4119
:
add
test
f
or trad
i
tio
n
al
p
atch an
d
different
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Haman
o
Merge
branch
'
fk/autoconf'
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hamano
Merge
branch
'
js/
n
ame-rev-fix'
commit
|
commitdiff
|
tree
2007-02-21
Jun
i
o C Hamano
prefixcmp(): f
i
x
-up leftover strncm
p
()
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hamano
pref
i
xcmp(): fi
x
-up m
e
chanical conversi
o
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-21
Junio C
H
amano
Mec
h
anical conversion
t
o use pref
i
x
c
m
p()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Ha
m
ano
Add prefixcmp
(
)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hamano
Merg
e
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-02-20
Ju
n
io C Hamano
Link 1
.
5
.
0
.
1 d
o
cu
m
en
t
ation f
r
om the main p
a
ge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-20
Juni
o
C Hamano
git-apply: requi
r
e -
p
<n> whe
n
working i
n
a
subdire
c
tor
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-20
Ju
n
io C H
a
mano
git-app
l
y
:
do not lose
c
wd when run from a subdirectory
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-20
J
unio C Hama
n
o
Merge branch 'js/d
i
ff-c
o
lor-check'
commit
|
commitdiff
|
tree
2007-02-20
Junio
C
Ham
a
no
M
e
rge b
r
a
n
c
h
'jc/fetch
-
notags'
commit
|
commitdiff
|
tree
2007-02-20
J
uni
o
C
Hamano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2007-02-19
Junio C
H
aman
o
Merg
e
branch
'
ap/
c
vsserv
e
r'
commit
|
commitdiff
|
tree
2007-02-19
Ju
n
io C Hamano
Merge b
r
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-02-19
Junio C Ha
m
ano
GIT 1
.
5
.
0
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-18
Junio C Hamano
Teach
'
git a
p
ply' to look at
$HOME/
.
git
c
onfig eve
n
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-18
Junio C H
a
mano
Update
draft release notes for
1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-18
Junio
C
Ham
a
no
M
e
rge branch 'maint
'
commit
|
commitdiff
|
tree
2007-02-18
Junio
C Ham
a
n
o
Update draft re
l
ease notes for
1
.
5
.
0
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-18
Jun
i
o C
H
amano
Me
r
ge git://git
.
kernel
.
org/pub/sc
m
/gitk/gitk into maint
commit
|
commitdiff
|
tree
2007-02-17
Ju
n
io C H
a
mano
T
e
ach co
r
e
.
autocrlf to 'gi
t
apply
'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-17
Junio C H
a
ma
n
o
Teac
h
'git a
p
ply' t
o
l
o
ok
at $GIT_DIR/config
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-17
Junio C
Ham
a
n
o
D
o not ta
k
e
m
ode bits fro
m
in
d
ex after ty
p
e
change
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-16
J
u
ni
o
C Hamano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2007-02-16
J
u
nio C Hamano
g
it-me
r
ge: minor fix f
o
r no_tri
v
ial_merge_strategie
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-16
Junio C Ham
a
n
o
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2007-02-16
Junio C Hamano
pretend-sha
1
: grave bugfix
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-15
Ju
n
io C Haman
o
remotes
.
not-ori
g
in
.
ta
g
opt
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-02-14
Junio
C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
next