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
Update draft release notes for v1.5.2
2007-04-22
Junio C Ha
m
a
no
Update draft release notes for v1
.
5
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio
C
Hamano
Documentation/Mak
e
file: fix section (5) in
s
t
a
lla
t
ion
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Update documentatio
n
links
t
o p
o
int at v
1
.
5
.
1
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C H
a
mano
Me
r
ge branch 'lt/objalloc
'
commit
|
commitdiff
|
tree
2007-04-22
Jun
i
o C H
a
m
a
no
Merge branch '
j
c/add'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Mer
g
e bra
n
c
h
'jc/
a
ttr'
commit
|
commitdiff
|
tree
2007-04-22
Junio C
H
amano
Me
r
ge branch 'lt/gitlink'
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
io C Hama
n
o
Me
r
ge branch 'np/pack'
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C Hamano
Me
r
ge branch 'jp/refs'
commit
|
commitdiff
|
tree
2007-04-22
Jun
i
o C Hamano
Merge bran
c
h 'jc/qu
i
ckfetch'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Ham
a
n
o
Merg
e
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-04-21
Ju
n
io C H
a
man
o
GIT
1
.
5
.
1
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
lockfile: recor
d
the primar
y
process
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio C H
a
mano
c
onver
t
.
c: restr
u
c
t
ure the attribu
t
e
che
c
king
p
a
rt
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Jun
i
o C Hamano
Fix bogus
linked-list
m
ana
g
e
ment for user d
e
fined merge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Ju
n
io C Hamano
git-clone: fix dumb protocol trans
p
ort
t
o clone from
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Jun
i
o C Hamano
git-
a
dd -u: match
t
h
e in
d
ex with working tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio
C
Haman
o
Mer
g
e
b
ranch 'maint'
commit
|
commitdiff
|
tree
2007-04-20
Jun
i
o C Hamano
Document gitattributes(5)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
J
u
nio
C Haman
o
Upda
t
e 'crlf
'
attrib
u
te semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Do
c
umentation:
s
upport manual section (5) -
file fo
r
mats
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio C
Haman
o
Mer
g
e br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-04-19
Junio C Ham
a
no
Simplify code t
o
find rec
u
rsi
v
e
merge driver
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
J
unio C Hamano
Count
o
-
f
ix
in m
e
rge-recursi
v
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C H
a
mano
Merge
b
ranch
'
main
t
'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hama
n
o
Fix f
u
nny types
u
s
e
d in a
t
tribu
t
e value represen
t
ation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Allow low-level dr
i
ver t
o
specify differe
n
t be
h
aviour
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ham
a
no
C
u
stom low-leve
l
merge
d
river: cha
n
ge the co
n
figur
a
tion
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C
Hamano
Allow the default
l
ow-level merge
driver to be configur
e
d
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C Hama
n
o
Cu
s
tom
l
ow-
l
evel merge dri
v
er support
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ham
a
no
Merge branch
'fl/c
v
sserver'
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
i
o
C Ham
a
no
Me
r
ge branch
'
m
a
int'
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o
C
H
amano
Update dr
a
ft release not
e
s for 1
.
5
.
2 with a
c
cumulated
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Me
r
ge branch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
amano
Star
t
prepa
r
ing for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
H
a
m
a
no
Merge b
r
anch 'master' of git://repo
.
o
r
.
cz/git-gui
commit
|
commitdiff
|
tree
2007-04-18
Junio
C Hamano
M
e
r
ge branch 'maint'
of git://repo
.
o
r
.
cz
/
git-
g
ui
i
nto
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Junio C H
a
mano
Merge branch
'jc/
r
ead-
t
re
e
-df'
commit
|
commitdiff
|
tree
2007-04-17
Junio C
Hamano
Add a de
m
onstr
a
tion/test of cu
s
tomized merg
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
J
unio C
H
amano
Allow
s
p
e
cify
i
ng spe
c
ialized merg
e
-backend per path
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ham
a
no
git-gui: Honor TCLTK_
P
A
TH if s
u
ppli
e
d
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C
Ham
a
no
merge
-
rec
u
rsive: s
e
parate out xdl_merge
(
) in
t
erfac
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C
Hamano
Allow more
t
han
true/fals
e
to attributes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Make su
r
e quickfet
c
h is not fooled
w
ith
a p
r
evious
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Jun
i
o C
H
amano
Merge bra
n
ch '
j
s/wrap-log'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Haman
o
s
e
nd-email:
d
o not l
e
av
e
an empty C
C
: line if no cc
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Jun
i
o C Hamano
M
erg
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-16
J
u
nio C Hamano
M
e
rge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Change attribute neg
a
t
ion marker from '!'
to '-'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Juni
o
C Ham
a
no
De
f
ine
a built
-
in a
t
tr
i
bute macro
"
b
inary"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
u
n
i
o C Hamano
attribute macro support
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio C Hamano
Makefile: add patch-ids
.
h
back in
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Fix 'd
i
ff' attrib
u
t
e semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
unio C
H
ama
n
o
Fix
'cr
l
f'
a
ttri
b
ute semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
Hamano
Merge git://gi
t
2
.
kern
e
l
.
or
g
/
pub/scm/gitk/gitk into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C Hamano
Teach
'
diff' about 'd
i
ff' attribute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Haman
o
Define 'crlf' attribute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C
H
amano
Add basic infrastru
c
t
ure to assig
n
attr
i
butes t
o
p
a
ths
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
J
u
nio
C Hamano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2007-04-14
Junio C H
a
mano
Replace a pair of patches with updated ones for
s
ubproject
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
J
unio
C
Haman
o
Do no
t
default to --no
-
index when given two
director
i
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Merge bran
c
h 'jc/che
r
ry'
commit
|
commitdiff
|
tree
2007-04-13
Jun
i
o C Hamano
Me
r
ge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hama
n
o
F
ix git {log,show,
.
.
.
}
--p
r
etty=emai
l
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
unio
C Ha
m
a
no
Do
c
umen
t
ation:
-
-cher
r
y-pick
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
unio C Hamano
git-log --cherry-pick A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o C Hamano
Refactor p
a
tch-i
d
filtering out of git-cherry
a
nd gi
t
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hama
n
o
Add %m to
'--pretty=format:'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
u
nio C Hamano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
Hamano
GIT
1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Junio C Ha
m
a
n
o
fsck: do not
c
om
p
lain on det
a
ch
e
d
HEAD
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Juni
o
C Hama
n
o
M
e
r
g
e
b
ranch
'
m
a
int'
commit
|
commitdiff
|
tree
2007-04-10
Jun
i
o
C Hamano
git-fetch: use fetch--tool pick-rref to av
o
id local
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C
H
aman
o
g
i
t-fetc
h
--t
o
ol pick-rref
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
t
3030: me
r
g
e-rec
u
rsive bac
k
e
n
d
test
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
merge-recursiv
e
: hand
l
e D/
F
c
on
f
lict c
a
se more
carefull
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
unio
C
Hamano
merge-re
c
ursive
:
do not
b
ar
f
on "
t
o be removed" entries
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
unio C Hamano
Treat
D/F conflict entry more carefully in unpack-t
r
ees
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
t1000
:
f
ix
case
t
able
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
u
n
io
C
Hamano
sho
r
tlo
g
-w: make w
r
ap-line
behaviour o
p
tiona
l
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Jun
i
o C
H
a
mano
Merge br
a
nch
'
j
c/push'
commit
|
commitdiff
|
tree
2007-04-09
Junio
C Hamano
Mer
g
e
b
ranch 'jc/mer
g
e-subtree'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
J
unio C Hamano
Merge branch '
j
s/fetch
-
progress'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hama
n
o
M
erge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-09
Juni
o
C Hamano
A
d
d Document
a
tion/cm
d
-list
.
made to
.
gitignore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Start 1
.
5
.
2 c
y
cle by prepa
r
eing
RelNotes f
o
r it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Merge branc
h
'jc/rea
d
-tr
e
e-df' (early part)
commit
|
commitdiff
|
tree
2007-04-08
J
unio
C
H
a
mano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
P
r
epare fo
r
1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ham
a
no
A new merge
s
tragety 'subtr
e
e'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
git-push to multiple
locations
d
oes not
s
t
o
p at the
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C Haman
o
git-push reports th
e
URL after failing
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ha
m
ano
M
e
rge branch 'jc/index-output'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Haman
o
Mer
g
e
b
r
a
nch 'fp
/
make-j'
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o
C
Hamano
Merge branch 'cc
/
bisect
'
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
H
am
a
no
Me
r
g
e
branch
'jc/checkout' (early part)
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
mano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Documentation: tig
h
t
en dependency fo
r
git
.
{h
t
ml,txt}
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
u
n
io C Hamano
git-bisect: allow bis
e
cting
w
i
th onl
y
o
n
e bad commit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
t6030
:
add a bit more test
s
to git
-
b
isect
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next