repo.or.cz
/
git
/
mergetool.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-05-02
J
u
nio
C
Hamano
M
er
g
e bran
c
h 'mai
n
t
'
commit
|
commitdiff
|
tree
2007-05-02
Junio C Hama
n
o
Merge branch 'maint' of git://
r
epo
.
or
.
c
z/git
/
fastimport
.
.
.
commit
|
commitdiff
|
tree
2007-05-01
Junio C Hamano
GIT v1
.
5
.
2-
r
c
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-05-01
Ju
n
io C H
a
m
an
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-05-01
Junio C Hamano
GIT v1
.
5
.
1
.
3
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-30
Junio C Ha
m
ano
Fix symlink ha
n
dling
i
n
git-svn
,
rela
t
ed
t
o PerlIO
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-29
Junio
C
Hamano
Merge branch 'jc
/
attr'
commit
|
commitdiff
|
tree
2007-04-29
Junio
C Hamano
Mak
e
sure
t
est-
g
enrandom and
test-
c
hmtime are buil
t
a
s
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-29
Jun
i
o C Haman
o
Mak
e
m
acros to preve
n
t double-inclusio
n
in headers
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-29
J
u
nio C
Hamano
Apply mailmap in
g
i
t-bla
m
e output
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-29
J
u
nio C
H
amano
Sp
l
it o
u
t mailm
a
p handlin
g
out of sh
o
rtlog
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-29
Junio
C
H
a
mano
blame -s: suppress author
n
a
m
e and time
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-29
Ju
n
i
o
C
Hamano
Me
r
ge commit 'gfi/m
a
ster'
commit
|
commitdiff
|
tree
2007-04-29
Junio C Hamano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-04-29
Junio
C Hamano
Fix import-t
a
rs fix
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-29
Ju
n
io C Hamano
U
p
date
.
mailmap wit
h
"Michael"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-29
Junio C H
a
mano
Do not
b
arf on too long action descr
i
pt
i
on
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-29
Juni
o
C Hamano
M
erge bran
c
h
'maint' of
g
it:
/
/repo
.
o
r
.
cz/git/fastimport
.
.
.
commit
|
commitdiff
|
tree
2007-04-27
J
uni
o
C H
a
man
o
Merge b
r
anch
'maint'
commit
|
commitdiff
|
tree
2007-04-26
Junio
C
Hamano
M
erge
b
ra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-26
Juni
o
C Hamano
St
a
rt
p
r
e
parin
g
for 1
.
5
.
1
.
3
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-26
Junio
C
Ham
a
no
Add -
-
date={lo
c
al,
r
el
a
tive,
d
efault}
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-25
J
u
nio C Hama
n
o
Add 'filte
r
' a
t
tribute
and
ex
t
e
r
n
al fi
l
ter driver definition
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-25
Jun
i
o C Ha
m
ano
A
d
d 'ident' conver
s
ion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-25
Junio
C Ha
m
ano
Mer
g
e br
a
nch 'jc/the-index'
commit
|
commitdiff
|
tree
2007-04-25
Junio C Hamano
Merge branch 'mk/diff
'
commit
|
commitdiff
|
tree
2007-04-25
J
u
n
io C Haman
o
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-25
J
u
nio
C H
a
ma
n
o
Merge branch
'mas
t
er' of git://re
p
o
.
or
.
cz/git/
f
astim
p
ort
commit
|
commitdiff
|
tree
2007-04-24
Junio C Ham
a
no
appl
y
mbox
&
quiltimport: typo
f
ix
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
Junio
C Ham
a
no
gitatt
r
ibut
e
s
d
ocum
e
ntation: clarify over
r
iding
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Ham
a
no
t/tes
t
-l
i
b
.
sh:
P
r
o
te
c
t ourselves from common mis
c
o
n
figurati
o
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Ha
m
ano
Di
f
f bet
w
een two blobs s
h
ould tak
e
mode c
h
anges into
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
J
u
n
i
o C Hamano
Merg
e
branc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-24
Ju
n
io C Hama
n
o
B
uild
R
PM with
E
TC_GITCONFIG
=
/e
t
c/gitconfi
g
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
Jun
i
o C Hamano
t60
3
0
:
grab
commit object
na
m
e as we go
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hama
n
o
t5302:
a
v
o
id usi
n
g tail -c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Haman
o
Documen
t
"diff=driver" attribute
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Juni
o
C
Hamano
Make r
e
ad-cache
.
c "the_in
d
ex" f
r
ee
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
J
u
nio C Hamano
Mo
v
e index-related
variables into
a
s
t
ructure
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
J
u
nio C Hamano
S
u
pport 'diff=pgm' attr
i
bute
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Ju
n
io C
H
amano
p
a
ck-o
b
jects: mak
e
generated pac
k
file read-
o
nly
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
J
unio C Hamano
Updat
e
tests not t
o
assume th
a
t g
e
ner
a
ted pac
k
files
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
J
unio C
H
a
m
ano
Fix 'quic
k
fix' on pa
c
k
-
obj
e
ct
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
io C Hamano
pack-obj
e
c
ts:
q
uickfix for
p
e
r
mission
m
odes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Update draft
release n
o
tes for v1
.
5
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
J
u
n
i
o C Hamano
Document
a
tion/Makefile: fix section (5) insta
l
latio
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C Hamano
Updat
e
documentation links to
point at v1
.
5
.
1
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio
C
Hamano
M
e
r
ge branch
'lt/obja
l
l
oc'
commit
|
commitdiff
|
tree
2007-04-22
Junio
C
Hamano
Merge branch
'jc/add'
commit
|
commitdiff
|
tree
2007-04-22
J
unio C Ha
m
ano
Merge branch
'
jc/attr'
commit
|
commitdiff
|
tree
2007-04-22
Junio C H
a
m
ano
M
e
r
g
e bra
n
ch 'lt/git
l
ink'
commit
|
commitdiff
|
tree
2007-04-22
Junio C H
a
mano
Merge
branch 'np/pack'
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C Hamano
Merg
e
branch '
j
p
/
refs'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merg
e
b
r
a
nch 'jc/quickfe
t
ch'
commit
|
commitdiff
|
tree
2007-04-22
Junio C H
a
ma
n
o
Merge bra
n
c
h
'm
a
int'
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
GIT 1
.
5
.
1
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio
C
Hamano
lock
f
il
e
: reco
r
d the primary process
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio C
Hamano
c
o
nvert
.
c: rest
r
uct
u
re
t
h
e
attribute
c
h
e
cking part
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
Fix bogus li
n
ked-list management for
us
e
r d
e
fined
m
e
r
g
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Juni
o
C Hamano
git-clone: fix dumb
p
rotocol transport to c
l
one from
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
J
unio C Hamano
g
it-ad
d
-u: match the index with working
tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-20
Junio
C
Ha
m
ano
Document
g
itattributes(5)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Jun
i
o C Ham
a
n
o
U
p
d
ate '
c
r
lf' attribut
e
semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
D
o
cu
m
enta
t
ion:
s
upport manual
section (
5
) -
f
i
le format
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
Merge branch '
m
ai
n
t
'
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
Simpli
f
y code to fin
d
recu
r
s
ive merg
e
d
river
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
Counto-fix in merg
e
-recursive
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Me
r
g
e
br
a
n
ch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Haman
o
Fix funny ty
p
e
s used
i
n attribute va
l
ue rep
r
esentation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io
C
Ham
a
no
Allow
l
ow-le
v
el drive
r
to specify different behaviour
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio
C
Hama
n
o
Custom low-level merge driver: change t
h
e
configura
t
ion
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
unio C Hamano
A
llow the
d
efault
low-level me
r
ge driver to be conf
i
gur
e
d
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
H
amano
Custom low-le
v
e
l
m
erge driver support
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ha
m
an
o
Merge branch 'fl/cvsse
r
ver'
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio
C Hamano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
amano
Update
draft release notes for 1
.
5
.
2
with accumulated
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
H
amano
Merge
bran
c
h
'
m
ain
t
'
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
amano
Start p
r
e
pari
n
g
f
or 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Junio
C Hama
n
o
Merge branch '
m
aster' of git://repo
.
or
.
cz/gi
t
-gui
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio
C
Hamano
Merge bran
c
h 'maint' of git
:
//repo
.
or
.
cz/git-gu
i
into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Jun
i
o C
H
amano
M
erge
b
ranch
'jc/read-tre
e
-df'
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Add a dem
o
nst
r
ation/test of customized merge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
J
unio C Hama
n
o
All
o
w specifying s
p
eciali
z
ed merge-backend
p
er
path
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
J
unio
C
H
ama
n
o
git-gui: H
o
n
o
r TC
L
T
K
_PATH if s
u
pplied
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
J
u
ni
o
C Hamano
mer
g
e
-
re
c
ursive: sep
a
rate out xdl_merge() interface
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C Ha
m
a
no
Allow more
t
han true/false t
o
a
t
trib
u
t
e
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
J
u
n
io C Hamano
Make su
r
e quickfetch is no
t
fooled with
a previous
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
M
e
r
g
e b
r
anch 'js/wrap-log'
commit
|
commitdiff
|
tree
2007-04-16
J
u
n
i
o
C Hamano
send-
e
m
ail:
d
o
not leave an empty CC: line if no cc
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Ju
n
io C Hamano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-16
J
unio C Hamano
Merge bran
c
h 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
C
hange
a
ttribu
t
e negati
o
n
m
arker
f
rom
'!'
to '-
'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
unio C Hamano
D
e
fine a built-in attr
i
bute
m
acro "binary"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
unio C
Hamano
at
t
ribute macro support
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o
C
H
a
m
ano
Mak
e
f
ile: add patch-ids
.
h back
i
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io C Ha
m
a
n
o
Fix 'diff' attribute sem
a
nt
i
cs
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
H
am
a
no
Fix
'
crlf' attr
i
bute
s
emantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o C Hamano
Merge git:/
/
g
it2
.
kernel
.
org/pub/scm/gi
t
k
/
gitk into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C
Hamano
Teach
'
d
iff' about 'diff' attri
b
ute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next
