repo.or.cz
/
git
/
dkf.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/diff-ni' (early part)
2007-02-28
Junio C Ha
m
ano
Mer
g
e
b
ran
c
h 'js/diff-ni' (early part)
commit
|
commitdiff
|
tree
2007-02-28
Junio C Hamano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2007-02-27
Junio C
H
ama
n
o
M
ake 'cvs ci'
lock
l
es
s
in git-cvsserver
b
y
u
sing git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-27
Junio C Ha
m
ano
Merge branch '
m
a
i
nt'
commit
|
commitdiff
|
tree
2007-02-27
Junio C Hamano
git
-
a
p
pl
y
: do
n
ot
fi
x
whitespaces on context lines
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
J
u
nio C Hama
n
o
Merg
e
b
r
anch 'master' into js/dif
f
-ni
commit
|
commitdiff
|
tree
2007-02-26
J
u
nio C
H
amano
Documen
t
ation:
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
Junio
C Hamano
Merge
branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-02-26
Juni
o
C Hama
n
o
G
I
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
D
o
c
u
m
e
ntat
i
on: describe "
-
f/-t/-m" option
s
to "g
i
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Junio C Haman
o
diff --cc: fi
x
dis
p
lay of syml
i
n
k
c
o
nflicts during
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
J
unio C
H
amano
M
e
rg
e
branch
'main
t
'
commit
|
commitdiff
|
tree
2007-02-26
Junio C Ham
a
n
o
Me
r
ge branch 'jc
/
merg
e
-sy
m
link' int
o
mai
n
t
commit
|
commitdiff
|
tree
2007-02-26
J
un
i
o C Hamano
merge-recursive: fix lon
g
standing
b
u
g in merging
s
y
mlinks
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-26
Junio C H
a
mano
merge-index: fix lo
n
g
standing b
u
g in m
e
r
g
ing
s
ymlin
k
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio C Ham
a
no
diff
-
-cac
h
e
d:
give more sensib
l
e error m
e
ssage whe
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio
C
H
amano
M
e
rge
branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-02-25
Junio
C
Haman
o
Add Releas
e
Note
s
t
o
p
r
ep
a
re for 1
.
5
.
0
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Ju
n
io C
H
a
mano
rerere: do not
deal wi
t
h symlinks
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
J
u
nio C Hamano
rerere:
do not skip
t
wo confl
i
cted paths next to each
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-25
Junio C
Haman
o
M
er
g
e git://repo
.
or
.
cz/git
-
gui into ma
i
nt
commit
|
commitdiff
|
tree
2007-02-25
J
u
nio
C
Haman
o
D
o
n'
t
mod
i
f
y CRED
I
T
S
-
F
ILE
i
f it hasn't ch
a
nged
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
Junio
C Hama
n
o
Evil Me
r
g
e
branch 'jc
/
sta
t
u
s
' (early
p
art) i
n
t
o j
s
.
.
.
commit
|
commitdiff
|
tree
2007-02-24
Ju
n
i
o
C
Hamano
Merge branch 'js/apply'
commit
|
commitdiff
|
tree
2007-02-24
Junio C
Hamano
Merg
e
b
ranch 'js/no
-
limit-boundary'
commit
|
commitdiff
|
tree
2007-02-24
Jun
i
o C
H
amano
Merge branc
h
'js/et
c
-config'
commit
|
commitdiff
|
tree
2007-02-24
Junio C
Hama
n
o
Merge bran
c
h
'maint'
commit
|
commitdiff
|
tree
2007-02-24
Ju
n
io C Hamano
d
iff
-
p
atch: Avoid em
i
tting double-slash
e
s
in
textual
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-24
Junio C Ha
m
ano
Reword git-a
m
3-
w
ay fallback failure mess
a
ge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-23
J
unio C H
a
mano
.
mailmap
maintenance afte
r
pu
l
ling from git-svn
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-23
J
u
n
i
o
C
Hamano
Merge
b
ranc
h
e
s 'lt/crlf' and
'
jc/apply-c
o
nfig'
commit
|
commitdiff
|
tree
2007-02-23
Junio
C Hamano
Me
r
g
e
branc
h
'mai
n
t'
commit
|
commitdiff
|
tree
2007-02-22
Junio
C Ha
m
ano
r
un_diff_{fi
l
es,i
n
dex
}
(
)
:
update calling convention
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
Juni
o
C Hamano
update-inde
x
: d
o
not die too early in a read-on
l
y re
p
osi
t
ory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
Junio C Ha
m
ano
git-status:
d
o
n
ot be tot
a
lly u
s
ele
s
s in a re
a
d-only
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
Ju
n
io C
H
amano
t4119: tes
t
autocomputing -p<n
>
for t
r
aditional diff
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-22
Junio C Hamano
g
i
t-ap
p
ly
:
g
u
ess correct
-p<n> va
l
ue
f
or no
n
-git
p
a
tch
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
J
unio C Hamano
g
it-apply: not
i
ce "d
i
ff
--git"
patch
a
gain
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Junio
C Ha
m
a
n
o
Me
r
ge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-02-21
Jun
i
o C Hamano
Mer
g
e branc
h
'master' of g
i
t://repo
.
or
.
c
z
/git-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-02-21
Junio
C Hamano
Fix botched "leak
f
ix
"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Ha
m
a
no
t
4119
:
add t
e
st f
o
r tradi
t
ional patch
a
nd different
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Junio C
H
amano
Me
r
ge
branch 'fk/autoconf'
commit
|
commitdiff
|
tree
2007-02-21
Junio C Ham
a
no
Mer
g
e branch 'js
/
nam
e
-rev-fix'
commit
|
commitdiff
|
tree
2007-02-21
J
u
nio C Ham
a
no
prefixcmp
(
): fi
x
-
up left
o
ver strncmp
(
)
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Junio C H
a
mano
prefixcm
p
(): f
i
x-up mec
h
a
nical conversion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-21
Junio C Hamano
Me
c
h
anical conve
r
sion to use pr
e
fix
c
mp()
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
Juni
o
C
Hamano
M
e
r
ge branch '
m
ain
t
'
commit
|
commitdiff
|
tree
2007-02-20
Jun
i
o C Ha
m
ano
Link 1
.
5
.
0
.
1
doc
u
mentation from the m
a
i
n
page
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-20
Junio C
Ha
m
ano
git-app
l
y
: require -p<n> wh
e
n
w
orking in a subdirectory
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-20
Junio C Hamano
git-apply:
d
o
not
lose cwd
when run from a subdirect
o
ry
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-20
J
u
nio C Hamano
Merge branch 'js/diff
-
color-check'
commit
|
commitdiff
|
tree
2007-02-20
J
u
nio
C
Hamano
Merge
b
ranch 'jc
/
fetch-notags'
commit
|
commitdiff
|
tree
2007-02-20
Junio C Hamano
Merge bran
c
h
'ma
i
nt'
commit
|
commitdiff
|
tree
2007-02-19
J
u
n
io C Ham
a
no
Merge
b
r
anch 'ap/cvsserver
'
commit
|
commitdiff
|
tree
2007-02-19
Junio C Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-02-19
Junio
C Hamano
GIT 1
.
5
.
0
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-18
Junio C Hamano
T
e
ach 'git appl
y
' to look at $HOME/
.
gitconfig ev
e
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-18
Junio C Hama
n
o
Update draft rel
e
ase
notes for 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-18
Junio C Hamano
Merge
branch '
m
a
i
nt'
commit
|
commitdiff
|
tree
2007-02-18
Junio C Hamano
Updat
e
draft r
e
lease n
o
tes
for
1
.
5
.
0
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-18
J
unio
C
Hamano
Merg
e
g
i
t
://git
.
ke
r
nel
.
org/pub/sc
m
/gitk/
g
itk
i
n
to maint
commit
|
commitdiff
|
tree
2007-02-17
Junio C H
a
mano
Teach cor
e
.
autocrlf
t
o 'git apply'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-17
Junio C Hamano
Tea
c
h
'git apply' to
l
oo
k
at $GI
T
_
D
IR/c
o
nfig
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-17
Junio C Hamano
D
o
not take
m
ode bits
from index after type c
h
ange
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-16
Ju
n
io C Hamano
Merge branch
'm
a
int
'
commit
|
commitdiff
|
tree
2007-02-16
Junio C H
a
mano
git-m
e
r
g
e: mino
r
fix for no_trivial_merge_strategies
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-16
Junio C Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-02-16
Junio C Hamano
pretend-sha1: gra
v
e
bug
f
ix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-15
Junio C Hamano
remo
t
es
.
not-origin
.
tagopt
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C
Hamano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-02-14
J
unio C Hamano
GIT-VERSION-FIL
E
: check
.
/version f
i
rst
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Ju
n
io C Hamano
t0020: add
t
est for
a
uto-crlf
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Ju
n
io C Hamano
[
PATCH] gitk: U
s
e s
h
ow-ref i
n
s
tead of ls-re
m
ote
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio
C
Ham
a
no
[PATCH]
M
a
k
e gitk work reasonably well on Cyg
w
in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
M
a
ke sure p
a
ckedg
i
twindowsize is
multiple of (pagesize
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio
C
Hamano
Add RelNo
t
e
s
1
.
5
.
0
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
J
unio C Hamano
Still updating 1
.
5
.
0 release notes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C
H
amano
Clarify two backward incompatible repos
i
tory
o
ptions
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
J
u
nio C Hamano
Point top-level
R
elNotes li
n
k at 1
.
5
.
1 relea
s
e notes
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
J
u
nio C Hama
n
o
Add RelNotes 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio
C
Hamano
Document --ignore-sp
a
ce-at-
e
ol
o
ption
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C
H
amano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2007-02-14
J
u
n
i
o C
H
amano
Ma
k
efile: update check-d
o
c
s
tar
g
et
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C
Hamano
cmd-list: add git-remote
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio
C
Ham
a
n
o
D
o
cume
n
tati
o
n:
D
r
op full-stop f
r
om
git-fast-
i
mpo
r
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Jun
i
o C Ham
a
no
b
l
a
me: --show
-
st
a
ts for
e
a
sie
r
optimization work
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C Hamano
Merg
e
branch 'j
s
/reverse'
commit
|
commitdiff
|
tree
2007-02-14
Junio
C Hamano
Merge br
a
nch 'jc/diff-apply-patch'
commit
|
commitdiff
|
tree
2007-02-14
Jun
i
o C Hamano
Merge branch 'jc/
m
er
g
e-base' (early part)
commit
|
commitdiff
|
tree
2007-02-14
Junio
C
Hamano
M
e
r
g
e
branch 'jc/deprecate'
commit
|
commitdiff
|
tree
2007-02-14
J
un
i
o
C Haman
o
Add li
n
k to v1
.
5
.
0 do
c
um
e
ntation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-14
Junio C
H
amano
GIT 1
.
5
.
0
commit
|
commitdiff
|
tree
2007-02-13
Ju
n
io C Ham
a
no
Add release notes to the distrib
u
tion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
Ju
n
io C Ha
m
ano
M
e
rge branch 'mas
t
er' of
git:
/
/rep
o
.
or
.
cz/g
i
t-gui
commit
|
commitdiff
|
tree
2007-02-13
Junio C Hamano
D
ocumentation
:
Moving
out of detac
h
ed HEAD does no
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
Ju
n
i
o
C Ha
m
ano
"
git-fetch --tags $URL"
s
hould not ove
r
wr
i
te e
x
isting
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
Jun
i
o C
Hamano
for-each-reflog: not having $
G
IT_DI
R
/
logs director
y
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-02-13
J
unio C Hamano
Do n
o
t
forget to pack
o
b
jects re
a
chable from HEAD refl
o
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next