repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Move index-related variables into a structure.
2007-04-23
Junio C
H
am
a
no
Move index-relat
e
d variables into a structure
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Junio C H
a
mano
Support 'diff=pgm' a
t
tribute
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
J
unio
C
Hamano
pack-objects: make g
e
ne
r
a
te
d
packfi
l
e
r
ead-o
n
ly
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Junio C H
a
m
ano
Update tests n
o
t t
o
assume
that generated
packfiles
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Fix 'quic
k
f
ix' on pack-objects
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio
C
Hamano
pac
k
-
o
bjects: quickfix for pe
r
missio
n
m
odes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
J
u
n
i
o C
Hama
n
o
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
Documentat
i
on
/
Makefile: fix section (
5
) in
s
tal
l
ation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
i
o
C
Hamano
Upd
a
te documentation link
s
to poi
n
t at v
1
.
5
.
1
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge br
a
nch 'l
t
/obja
l
loc'
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C Hamano
Me
r
ge branch 'jc/add'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Ha
m
an
o
Merge branch
'jc/attr'
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C Hamano
M
e
r
g
e branc
h
'lt/gitlink'
commit
|
commitdiff
|
tree
2007-04-22
Junio C
H
amano
Mer
g
e branch 'np/pack'
commit
|
commitdiff
|
tree
2007-04-22
Jun
i
o C Hamano
Me
r
ge b
r
an
c
h 'jp/refs'
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
i
o C Hama
n
o
M
e
rge
b
r
anch 'jc/quickfetch
'
commit
|
commitdiff
|
tree
2007-04-22
J
unio C Hamano
Merge
b
r
anch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-21
Ju
n
io 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
loc
k
file: record the primary proce
s
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
J
unio C Hama
n
o
convert
.
c: restructure
t
he
a
ttribute checking
part
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Haman
o
Fix
b
ogus linked-list
m
anage
m
e
n
t for user def
i
ned merge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Jun
i
o
C Ha
m
ano
g
it-clone: fix dumb protocol
t
ranspor
t
to
c
lone
from
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
g
it-add -u: m
a
tch the index wit
h
work
i
ng tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
J
u
nio C Ham
a
no
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-20
J
unio C Hamano
Document
gitattributes
(
5)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Update 'cr
l
f' att
r
ibut
e
s
e
mantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Jun
i
o C Hamano
Docum
e
ntat
i
on: sup
p
ort manual section (5) -
file fo
r
mats
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio C
H
amano
Merge branc
h
'
m
aint'
commit
|
commitdiff
|
tree
2007-04-19
Jun
i
o
C
Hamano
Simplify code
t
o find
recursiv
e
merge
dri
v
er
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio
C H
a
mano
Counto-fix
i
n merge-
r
ecursive
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
unio C Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Fix funny types use
d
in
a
tt
r
ibut
e
value
r
epresentation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
amano
Allow
l
ow-level dr
i
ve
r
t
o
specify diffe
r
ent be
h
a
v
iour
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
unio C Hama
n
o
Custom
low-leve
l
merge driver:
c
h
ange the confi
g
uration
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Hama
n
o
A
llow th
e
default low-level mer
g
e
d
river to be configured
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C Hamano
Custom low-level merge driver
s
upport
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge branch 'fl
/
cvsser
v
er'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
M
er
g
e branch
'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-18
J
unio C Hama
n
o
U
p
d
a
te draft
r
el
e
a
s
e notes for 1
.
5
.
2 with accu
m
ulated
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
unio
C Hamano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C H
a
mano
Start preparing for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge branch 'ma
s
ter' o
f
g
it:
/
/repo
.
or
.
c
z/git-gu
i
commit
|
commitdiff
|
tree
2007-04-18
Junio C
Hamano
M
e
rg
e
bra
n
c
h 'main
t
' of git://repo
.
o
r
.
cz/git-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Junio C H
a
mano
Merge branch 'jc/read-tree
-
df'
commit
|
commitdiff
|
tree
2007-04-17
Junio C
Hama
n
o
Add a
demonstrati
o
n/test of
custo
m
ized
m
erge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Allo
w
specifying
specia
l
ized merge-backend per path
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C
Hama
n
o
gi
t
-
g
u
i
: Honor TCLT
K
_
P
AT
H
i
f supplied
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ham
a
n
o
merge-recur
s
ive: separate out xd
l
_merge() inte
r
face
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
J
u
n
io C Ham
a
n
o
Allow more t
h
an true/false to att
r
ibutes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Juni
o
C Hamano
Make su
r
e quickfetch i
s
not fo
o
led w
i
th a prev
i
ou
s
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Ham
a
n
o
Merge
bra
n
ch
'
js
/
w
rap
-
log'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Ha
m
an
o
send-em
a
il: d
o
n
ot leave
a
n
empty CC: line if
n
o cc
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
M
e
rge br
a
nch
'maint'
commit
|
commitdiff
|
tree
2007-04-16
Junio C
H
aman
o
Merge branch '
m
a
i
nt'
commit
|
commitdiff
|
tree
2007-04-15
Junio C Haman
o
Change attr
i
bute neg
a
tion
marker from '!' to '-'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
uni
o
C
Hamano
Define
a
bui
l
t-in
a
ttribut
e
macro "b
i
nary"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io C
Ham
a
no
attribute macro s
u
pport
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Juni
o
C Haman
o
Makefile: add patch-ids
.
h
back
in
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
unio C Hamano
F
i
x 'dif
f
' att
r
ib
u
te semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
unio
C Hamano
Fix 'cr
l
f' attribute
semant
i
cs
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Merg
e
git://git2
.
ker
n
el
.
org/pub/scm/gi
t
k/gitk i
n
to
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Teach 'diff' abou
t
'diff' attrib
u
te
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C
H
amano
Def
i
ne 'crlf'
a
ttr
i
bute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio
C
Ham
a
no
A
d
d
basic infrastruct
u
re to assign attribute
s
t
o
p
a
th
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Jun
i
o C Haman
o
M
e
rge branch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C Hamano
Replace
a p
a
ir of patches with updated ones fo
r
subproject
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C
Hamano
Do
not defaul
t
t
o
--
n
o-i
n
dex
w
hen giv
e
n two dire
c
tories
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Jun
i
o
C Ha
m
ano
Merge branch '
j
c/cherry'
commit
|
commitdiff
|
tree
2007-04-13
Junio
C
H
amano
Mer
g
e b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-04-13
Juni
o
C Hamano
Fix git {log
,
sho
w
,
.
.
.
} -
-
pretty=
e
mail
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
u
n
i
o C Ham
a
no
Documentation: --c
h
e
r
ry-pick
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
u
nio C Hamano
git-log --c
h
erry-pick A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
u
nio
C
H
a
man
o
Refactor patch-id filtering ou
t
of
g
i
t-cherry an
d
g
i
t
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o C Hamano
A
dd %m
t
o '--pre
t
ty=for
m
at:'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
un
i
o C Hamano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
H
amano
G
I
T
1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Junio C Hama
n
o
fs
c
k
:
d
o not c
o
m
p
lain on detached HEAD
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
un
i
o C Hamano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hama
n
o
git-fetch: use fet
c
h--tool pick-rre
f
to avoid local
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
u
nio C H
a
mano
git-fetch--tool pick-rref
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
i
o C Hamano
t3030
:
mer
g
e-recursive backend
t
est
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
unio
C Hamano
merge-recursive: handle D/F conflict case more
carefully
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Ha
m
ano
merge-recursive: do
n
ot barf on "to be
r
emo
v
ed" entries
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Ha
m
a
n
o
Tr
e
a
t
D
/F
c
o
n
flict
entry
m
ore carefully
in unpack-trees
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C
H
a
m
a
no
t1000: fix case t
a
ble
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C H
a
mano
shor
t
log -w: make wr
a
p-line behaviour optional
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Juni
o
C
H
a
m
a
no
Me
r
g
e branch 'j
c
/push'
commit
|
commitdiff
|
tree
2007-04-09
Jun
i
o C Hamano
Merge branch 'jc/merge-subtree
'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C
H
amano
Merge branch 'js/f
e
tch-progress'
commit
|
commitdiff
|
tree
2007-04-09
Junio
C
Hamano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Ham
a
n
o
Add Docu
m
entat
i
on/cmd-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 cycle by
p
repareing RelNot
e
s for
it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C
H
amano
Merg
e
branch 'jc/read-tree-df' (ea
r
ly part)
commit
|
commitdiff
|
tree
2007-04-08
Junio C Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-08
J
u
nio C
H
aman
o
Pre
p
are for 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
A new me
r
ge stra
g
ety 'subtree'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
git-pu
s
h
to multiple
lo
c
ati
o
ns d
o
es not
s
to
p
at the
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ham
a
no
g
it-push reports the URL afte
r
failing
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
u
n
io
C Ha
m
ano
Merge branch
'jc/index-ou
t
put'
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio C Hamano
Merge branch 'fp/make-j'
commit
|
commitdiff
|
tree
next