repo.or.cz
/
git
/
jnareb-git.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-04-25
J
u
nio C Hamano
Mer
g
e branch
'
main
t
'
commit
|
commitdiff
|
tree
2007-04-25
Junio C Hama
n
o
Merge bran
c
h
'
m
aster' of git://repo
.
or
.
cz/git/fastimport
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
app
l
ymbox & qu
i
ltim
p
ort: t
y
pofix
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Ha
m
a
n
o
gitattr
i
butes d
o
cumentat
i
on:
clarify over
r
iding
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
t/t
e
st-li
b
.
sh: Prote
c
t our
s
el
v
es
f
rom
common m
i
sconfiguration
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
Merge
b
ranch 'm
a
i
nt'
commit
|
commitdiff
|
tree
2007-04-24
Junio C
H
amano
Build RPM
w
i
th ETC_GITCON
F
IG=/
e
tc/
g
itco
n
fig
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Ha
m
ano
t6
0
3
0
: grab
c
omm
i
t ob
j
ect name as we go
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
J
u
nio C
Hamano
t5
3
02:
av
o
i
d
u
sing tail -c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Ju
n
io C Hamano
Docum
e
nt "diff=driver" at
t
ribute
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
J
u
nio C
Ham
a
no
Suppo
r
t
'diff=pgm' attr
i
but
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
J
u
nio C Hamano
pac
k
-o
b
jects: make generated pa
c
kfile read-only
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Ham
a
no
Update tes
t
s not
t
o assume
t
hat generated packfiles
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Ha
m
ano
Fix 'q
u
i
c
kfix'
on
pack-objects
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
io C Hamano
pack-
o
bjects: quickfix fo
r
perm
i
ssion modes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
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 Ha
m
a
no
Doc
u
mentat
i
o
n/Makefile: fix sec
t
ion (5
)
insta
l
lation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C
H
a
mano
Update
documentat
i
on l
i
n
ks to point at v1
.
5
.
1
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
M
e
r
g
e
b
ranch
'lt/ob
j
al
l
oc'
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C Hamano
Merg
e
branch 'jc/add'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Ha
m
ano
Merge branch 'jc/attr'
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C Hamano
Me
r
ge branch
'lt/gitli
n
k'
commit
|
commitdiff
|
tree
2007-04-22
Junio
C
H
amano
Merge bran
c
h 'np/pack'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
M
e
rge br
a
nch 'jp/re
f
s
'
commit
|
commitdiff
|
tree
2007-04-22
Junio C
H
amano
Merge
b
ra
n
ch 'jc/quickfetch'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge bran
c
h '
m
aint'
commit
|
commitdiff
|
tree
2007-04-21
Jun
i
o 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
l
o
ckfile: recor
d
the prim
a
ry
p
rocess
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Juni
o
C Haman
o
convert
.
c: restructure the at
t
r
i
b
ute checking part
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
J
u
ni
o
C Hamano
F
ix bogus linked-l
i
st management for user defined me
r
ge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
g
i
t-clone
:
fix dumb protocol tra
n
sport to
clone from
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio
C
Ham
a
n
o
g
it-a
d
d -u: mat
c
h t
h
e
i
ndex with working
t
ree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-20
J
unio C H
a
m
a
no
D
ocument gitattribu
t
es(5)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
J
unio C
H
amano
Updat
e
'crlf' attribute se
m
antics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Juni
o
C
H
a
mano
Do
c
u
mentation: supp
o
r
t m
a
nual section (5) - file
formats
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Jun
i
o C Hamano
Merg
e
branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-19
Junio C
H
amano
Simplify co
d
e to
find recursi
v
e merge driver
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
J
unio C Hamano
C
ounto-f
i
x in mer
g
e-r
e
cursive
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge
branch
'
main
t
'
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C H
a
m
an
o
F
ix funny types used in
attribute va
l
ue rep
r
esentat
i
on
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
unio C Hama
n
o
Allow low-level driver to specify different behaviour
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C H
a
mano
C
u
stom low
-
level merge driver: change the
confi
g
urati
o
n
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C Hamano
A
l
low th
e
default low
-
level
m
erge driver to be configured
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Custom
l
ow-level
merge drive
r
sup
p
ort
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C Ham
a
no
Merg
e
branch 'fl/
c
vsserve
r
'
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C Hamano
M
e
r
ge
branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-18
J
unio C Hamano
Up
d
ate dr
a
ft rele
a
se notes fo
r
1
.
5
.
2 with accumulated
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Hama
n
o
Start
p
reparing for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hama
n
o
Merge
b
ranch 'ma
s
ter' of git://r
e
p
o
.
or
.
c
z
/git
-
gui
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ham
a
no
Merge
b
ranch 'maint
'
of git://r
e
po
.
o
r
.
c
z/git
-
gu
i
into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Junio C H
a
m
a
n
o
M
erge b
r
anch
'jc/read-
t
ree-df'
commit
|
commitdiff
|
tree
2007-04-17
Junio
C
Hamano
Add
a
demonst
r
a
ti
o
n/test of c
u
stomized merge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Allo
w
spec
i
fying sp
e
cialized merge-backend per path
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io C Hamano
git-
g
ui: Honor
TC
L
TK_PATH
i
f supp
l
i
e
d
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C
Hamano
mer
g
e
-recur
s
iv
e
: separate out xd
l
_merge() inte
r
face
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C
Hamano
Allow mor
e
tha
n
true/
f
alse to at
t
rib
u
tes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
M
a
ke sure qui
c
kfetch is no
t
f
o
oled with
a pr
e
vio
u
s
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Juni
o
C Hamano
Merge branch 'js/wr
a
p
-log
'
commit
|
commitdiff
|
tree
2007-04-16
Junio
C Hamano
s
e
nd-
e
mail: do
n
o
t leave an
empty
CC: li
n
e
if
n
o cc
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Junio
C Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-16
Junio C
H
amano
M
erge bran
c
h '
m
aint'
commit
|
commitdiff
|
tree
2007-04-15
Junio C Ha
m
ano
Change
attr
i
bute
n
ega
t
ion marker
from
'
!' to '-'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
u
n
io
C
Hamano
D
e
fine a
buil
t
-
i
n attribute
macro "bi
n
ary"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
attribute
macr
o
support
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io C Ham
a
no
Makefile: add patch
-
i
d
s
.
h back
i
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Fix 'diff'
a
ttribute semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
Hamano
Fix 'crl
f
' att
r
i
but
e
sem
a
ntics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io
C
H
amano
Mer
g
e
g
i
t:
/
/
git2
.
kernel
.
org/p
u
b/scm/gitk/gitk into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
io C Ha
m
ano
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
a
mano
De
f
ine
'
crlf' attribute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
io C Hamano
Add
basi
c
infrastructure to assign at
t
ributes to paths
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-14
J
u
nio C
Hamano
Replac
e
a
pair of p
a
tches with updated o
n
es for subpr
o
je
c
t
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Jun
i
o C Hamano
Do not
defa
u
lt to --no-index when gi
v
en t
w
o
d
irecto
r
ies
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
J
unio C
H
amano
M
e
rge branch 'jc/c
h
erry'
commit
|
commitdiff
|
tree
2007-04-13
J
unio C
H
a
mano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hama
n
o
F
i
x git
{
log,sho
w
,
.
.
.
} --pretty=
e
mail
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Documentation: --cherry-pic
k
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o C
Hamano
g
it-log --cherry-pick
A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Ha
m
ano
Refactor
patch-id f
i
lter
i
ng out
o
f git-c
h
erry and g
i
t
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C
Ham
a
no
Add %m
t
o
'--pretty
=
format:'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C Hamano
Me
r
ge br
a
nc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-12
J
u
nio C Hamano
G
I
T 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Junio C
H
amano
fs
c
k: do not complain on detac
h
ed HEAD
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-10
J
unio C Ha
m
a
no
git-fetch: use fetch
-
-tool pick-rre
f
t
o
avoi
d
loc
a
l
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Juni
o
C
H
a
m
a
n
o
git-fe
t
c
h--tool
p
ick-rref
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Juni
o
C
H
am
a
no
t30
3
0:
mer
g
e-recurs
i
ve bac
k
end t
e
st
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Juni
o
C Hamano
merge-recurs
i
ve:
h
andle
D
/F conflic
t
case more
c
arefull
y
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C Hamano
me
r
ge-
r
ecursive
:
do not barf
on "
t
o be rem
o
ved" entries
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C
Ham
a
n
o
Treat D/
F
con
f
l
ict
entry more careful
l
y
in unpack-trees
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Jun
i
o C
H
am
a
no
t1000:
fix
case table
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C
Ham
a
no
shortlog
-
w:
make wrap-lin
e
behav
i
o
u
r
optional
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
M
erg
e
branch 'jc/p
u
sh'
commit
|
commitdiff
|
tree
2007-04-09
Junio C
H
amano
Merg
e
br
a
nch 'jc/merge
-
subtree'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merge branch 'js/
f
e
tch-p
r
ogress'
commit
|
commitdiff
|
tree
2007-04-09
J
unio C Hamano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
Jun
i
o C
Hamano
A
dd Docu
m
entati
o
n/cmd-list
.
made to
.
git
i
gno
r
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next