repo.or.cz
/
git
/
fastimport.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Avoid excessive rewrites in merge-recursive
2007-04-26
Ju
n
io C
Hamano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-04-26
Junio C Hamano
Start preparing for
1
.
5
.
1
.
3
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-26
Junio C Hamano
Ad
d
--da
t
e={l
o
cal,relat
i
ve,
d
efa
u
lt}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-25
Junio C H
a
m
a
n
o
M
e
rge br
a
nch
'
jc/th
e
-i
n
dex'
commit
|
commitdiff
|
tree
2007-04-25
Jun
i
o C Hamano
Merge bran
c
h '
m
k/
d
iff'
commit
|
commitdiff
|
tree
2007-04-25
J
u
n
i
o
C Hamano
Merge branch 'm
a
i
n
t
'
commit
|
commitdiff
|
tree
2007-04-25
Junio C Hamano
Merge
b
ranch
'
ma
s
ter'
o
f g
i
t:/
/
repo
.
or
.
c
z/git/f
a
stimport
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
applymbox & quiltimp
o
rt:
typofix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio
C Hamano
g
itattributes documentat
i
on: clarify overriding
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
t/test-lib
.
sh: Protect ourselves from
c
ommo
n
misconf
i
gu
r
a
t
ion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hama
n
o
Diff betwee
n
two bl
o
b
s
should tak
e
m
ode
c
han
g
e
s
into
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Jun
i
o C Hamano
Me
r
ge branch
'm
a
i
n
t'
commit
|
commitdiff
|
tree
2007-04-24
Junio C Ham
a
n
o
Build RPM with
ET
C
_GITCO
N
F
IG=/e
t
c/git
c
onf
i
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Haman
o
t6
0
30: gr
a
b commit
object name as we go
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
t5302
:
avoid using tail -c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio
C
Ham
a
no
Doc
u
m
e
nt "d
i
ff=driver" attribute
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C H
a
m
a
no
Make re
a
d-cach
e
.
c
"the_index" free
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hamano
Mov
e
i
n
dex-related
variables int
o
a s
t
ruct
u
re
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio
C
Hamano
Suppo
r
t 'diff=pgm' attribute
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hamano
pack-
o
bje
c
ts: ma
k
e generate
d
packfile read-o
n
ly
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio
C
Hamano
Up
d
ate test
s
not to assume
that generated p
a
ckfiles
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C
Hamano
Fix '
q
uickfi
x
' o
n
pack
-
obj
e
ct
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
pack-objects:
quickfix for permission modes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Update
d
raft releas
e
notes
f
or 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
Docu
m
entation/Makefile
:
fix section (5) instal
l
ati
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C
H
amano
Update do
c
umentation links
to poi
n
t at v1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge branch
'lt
/
objalloc'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Haman
o
Merge branch 'jc/a
d
d'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge branch 'jc/a
t
tr'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge br
a
nc
h
'lt
/
gitlin
k
'
commit
|
commitdiff
|
tree
2007-04-22
J
unio C Hamano
Merge
br
a
nch '
n
p/pack'
commit
|
commitdiff
|
tree
2007-04-22
Jun
i
o
C Hamano
Merge bra
n
ch 'jp
/
re
f
s'
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C Ha
m
ano
Me
r
g
e b
r
anch
'
jc/quickf
e
tch'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge bran
c
h 'ma
i
n
t'
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
G
IT 1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C H
a
m
ano
lo
c
k
f
ile: record the primary pro
c
ess
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
J
unio C Hamano
convert
.
c: res
t
r
ucture the at
t
ribute c
h
ecking pa
r
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
F
i
x
bogus linked-li
s
t management fo
r
u
ser defined me
r
ge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Ju
n
i
o C Hamano
git-clone: fix dumb protocol
transport to clon
e
from
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Ju
n
io C Hamano
g
i
t-add -u: match the
ind
e
x
w
it
h
workin
g
tre
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C
H
ama
n
o
Me
r
g
e b
r
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-04-20
Junio
C Ham
a
no
Document g
i
tatt
r
ibu
t
es(5)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Jun
i
o C Hamano
Update 'crlf'
a
t
t
ribute semanti
c
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
J
u
nio C Hamano
D
oc
u
ment
a
t
i
on: support manual section (5) - file
f
ormats
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
Simplify code to find
r
e
c
ursiv
e
me
r
ge driv
e
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
Counto-fix in me
r
ge-recursive
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C H
a
man
o
Mer
g
e branch
'
maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C
Hamano
Fix f
u
nny types us
e
d
in attribute value representation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C Hamano
Allow low-level driver to specify different behaviour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
unio C Hama
n
o
Custom
l
ow
-
level merge driver: cha
n
ge the configu
r
a
t
ion
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Allow th
e
defau
l
t low-le
v
el merg
e
driver to be c
o
nf
i
gured
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Hamano
Custom l
o
w-le
v
el merge driver support
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ham
a
no
Merge bran
c
h
'
fl/
c
vsserver
'
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
i
o C
H
a
m
ano
Merg
e
branc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ham
a
no
Update dr
a
ft 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
ama
n
o
Merge branch 'm
a
int
'
commit
|
commitdiff
|
tree
2007-04-18
Junio
C Hamano
Start preparing for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Hamano
Merge branch 'm
a
ster' of git://repo
.
or
.
cz/git-
g
u
i
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C Haman
o
Merge branch 'maint' of g
i
t://repo
.
o
r
.
cz/g
i
t
-gui
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Junio C
H
a
mano
Merge br
a
nch
'
j
c
/read-tree
-
df
'
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
A
d
d a demonstra
t
ion/test
of
c
ustomized me
r
ge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io C Hamano
A
llow s
p
ecifying spec
i
al
i
ze
d
merge-
b
ackend per
pa
t
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
u
nio C Hamano
git-gui: H
o
n
o
r TCLTK
_
PATH if
s
upplied
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ha
m
a
n
o
merge-recursive: separ
a
te out xdl_merge() interfac
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
u
nio C Hamano
All
o
w more than true/f
a
lse to
attribut
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C
H
amano
Make sure qu
i
ckfetch is not foole
d
w
i
t
h a previous
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Junio C
Ham
a
no
M
e
rge b
r
anch 'js/wrap
-
log'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Ham
a
n
o
s
e
nd-email: do not leave an
e
m
pty CC:
l
ine if no cc
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
J
u
nio C Haman
o
Merge
b
ranch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-16
Junio C
H
a
mano
Merge
b
r
a
n
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-15
Juni
o
C
Hama
n
o
C
h
a
n
ge attri
b
ute negation marker from '!' t
o
'-
'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C H
a
mano
Define a
built-in attri
b
ut
e
mac
r
o "b
i
n
ary"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C H
a
m
a
n
o
attribut
e
macro support
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio
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 'diff
'
a
ttr
i
b
ute seman
t
ics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Ha
m
a
n
o
Fix 'c
r
lf' attri
b
ute semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Juni
o
C Ham
a
no
Merge git://g
i
t2
.
kernel
.
org/p
u
b/scm/gitk/gitk into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio
C Hamano
Teach 'dif
f
'
a
bout 'diff' attribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C
H
amano
De
f
ine 'crlf
'
a
t
t
r
i
bu
t
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
J
unio C
H
aman
o
Add bas
i
c
in
f
ra
s
tructure to assign attributes to paths
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
M
e
r
g
e branch
'
maint'
commit
|
commitdiff
|
tree
2007-04-14
J
u
n
i
o C Ham
a
no
R
e
pl
a
ce a pair of
p
a
t
che
s
with up
d
ated ones f
o
r subpr
o
ject
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Do n
o
t defa
u
l
t to
--no-index when
g
i
v
en two directories
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Mer
g
e branch 'jc/cherry'
commit
|
commitdiff
|
tree
2007-04-13
J
un
i
o C Hamano
M
e
rg
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Fix git {log
,
show,
.
.
.
} --prett
y
=em
a
i
l
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Documentation:
-
-cherry-
p
ick
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
H
aman
o
git-
l
og --ch
e
rr
y
-pi
c
k A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C
H
a
mano
Refact
o
r patch-id filter
i
ng out of git-c
h
erry and git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Ad
d
%m to
'--pretty=format:
'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Merge
b
ranc
h
'ma
i
nt'
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 Hamano
f
s
ck:
do not c
o
mplain on de
t
ached H
E
AD
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
M
e
rge branch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
g
i
t
-
f
e
tch: use f
e
tch--
t
ool pick-rref to a
v
oid local
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Jun
i
o C Hamano
git-
f
etch
-
-too
l
p
ick-rref
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
t3
0
30: me
r
ge-rec
u
rsive backend te
s
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
merge-r
e
cur
s
ive: h
a
n
d
le D/F conflict case more
carefully
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
merge
-
r
ecur
s
ive:
do not bar
f
on "to be removed" entries
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next