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
Fix bogus linked-list management for user defined merge drivers.
2007-04-21
Junio C H
a
mano
Fix b
o
gus lin
k
ed-
l
i
st
m
an
a
gement fo
r
user defined
m
er
g
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Ju
n
io C Ham
a
no
Document gi
t
a
t
tribute
s
(5)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C
Hamano
Update
'
crlf' a
t
tri
b
ute semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Juni
o
C Hamano
Docu
m
ent
a
tion: sup
p
ort
manua
l
section (5)
- fil
e
f
o
r
mats
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
Simplify co
d
e
to find
r
ecursive merge
dri
v
er
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio C
Ha
m
ano
Co
u
nto-
f
ix in merge-rec
u
rsive
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
unio C Ham
a
n
o
Fix funny ty
p
e
s
used in attribute value representation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hama
n
o
A
l
low
l
ow-le
v
e
l
driver
t
o
sp
e
cif
y
differ
e
nt behaviour
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C Hama
n
o
Custo
m
low-
l
evel m
e
rg
e
d
r
iver: chan
g
e
the
config
u
ration
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Allow
th
e
defau
l
t lo
w
-le
v
el merge driver to be configure
d
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
amano
Custom low-lev
e
l merge driver support
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ham
a
n
o
Add
a de
m
onstration/t
e
st of
c
u
stomized merge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C
Hamano
Allow specifying
s
pecialize
d
merge-backend per pat
h
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
me
r
ge-rec
u
r
s
ive: se
p
arate out xdl_mer
g
e() interfac
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
J
unio C Ha
m
ano
Allow
mor
e
t
h
a
n
tr
u
e
/
f
a
lse
t
o attr
i
butes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio C Hamano
Change attribute nega
t
ion marker from '
!
' to '-'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
i
o
C
Hamano
Define
a
bu
i
lt-in attribute macr
o
"binary"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
attribu
t
e 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-
i
ds
.
h back in
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C H
a
mano
Fix 'dif
f
'
attribute sem
a
nt
i
cs
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C H
a
mano
Fix 'crlf' attribute semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Teac
h
'diff' about 'diff' attribut
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
J
u
nio C Hamano
Define 'crl
f
' attr
i
bute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
io C H
a
m
a
no
Add basi
c
infrast
r
u
c
ture to
assign a
t
tribu
t
es
to paths
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
M
e
rge
branch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-14
Junio C
H
aman
o
D
o
n
o
t
d
efaul
t
to --no-index when given two dire
c
tories
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Junio
C
Hamano
Merge branch 'jc/cherry'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Merge bra
n
ch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Fi
x
git {l
o
g
,show,
.
.
.
}
--pretty=email
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C
Hamano
Documentation: --cherry-p
i
ck
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
unio
C Hamano
git-lo
g
--cherry-pick A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
u
nio C
H
amano
Refactor patch-
i
d
filtering ou
t
of gi
t
-
cherry
an
d
git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C H
a
man
o
Ad
d
%
m
to '--prett
y
=format:
'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C
Hamano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-12
J
unio C Hamano
GIT 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
J
unio C Hamano
f
s
c
k: do not co
m
plain on detached HEAD
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C
Hama
n
o
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
J
u
nio C Ham
a
no
M
e
rge branch
'
jc/pu
s
h
'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
M
erge branch 'j
c
/
merge-subtree
'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Jun
i
o
C H
a
mano
Merge branch 'js/fetc
h
-progress'
commit
|
commitdiff
|
tree
2007-04-09
J
u
nio C Hamano
M
erge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Add Docume
n
tation/c
m
d
-
lis
t
.
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
b
y preparein
g
RelNot
e
s
for it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Ha
m
ano
Merge branch 'jc/read-tree-df' (early
pa
r
t
)
commit
|
commitdiff
|
tree
2007-04-08
Ju
n
io C Ham
a
n
o
Merge b
r
anc
h
'
maint'
commit
|
commitdiff
|
tree
2007-04-08
J
u
n
io C
H
amano
P
repa
r
e for 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio C Hamano
A new merge stragety 'subt
r
ee'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C Ha
m
ano
git-push to mult
i
ple locations does not
st
o
p at the
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ha
m
a
n
o
git-push
reports the
U
RL after failing
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C Hamano
Merge b
r
a
n
c
h
'jc/inde
x
-
outp
u
t'
commit
|
commitdiff
|
tree
2007-04-07
J
unio C Ha
m
ano
Merge b
r
anc
h
'fp/make
-
j'
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
mano
Merg
e
bra
n
ch 'cc
/
bisect'
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Hamano
Me
r
ge branch 'jc/ch
e
ckout' (ear
l
y part)
commit
|
commitdiff
|
tree
2007-04-07
J
u
n
i
o C Hamano
Merg
e
br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-04-07
J
unio C Hamano
Doc
u
mentation:
tighten dependen
c
y
for
git
.
{
h
tml,txt}
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
g
it-b
i
sec
t
: allow bise
c
ting with only one bad
c
ommit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
H
amano
t6030: add a b
i
t more
test
s
to git-bisect
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
J
unio C Hamano
git-bisect: moderni
z
ation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Jun
i
o
C Hamano
M
e
rge
bra
n
ch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-05
J
unio C Ha
m
a
no
Rename add_
f
ile_to_in
d
ex() to
a
dd_file_to_cache
(
)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Jun
i
o
C
Ha
m
ano
Renam
e
sta
t
ic variab
l
e w
r
it
e
_index t
o
upda
t
e_index
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Rename
i
n
te
r
nal function "add_f
i
le_to_cache" in builtin
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
J
unio C Hamano
Prop
a
g
ate cach
e
error internal to refre
s
h
_
c
ache() via
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Juni
o
C Hama
n
o
Fix bogus erro
r
m
e
ssag
e
fr
o
m
me
r
g
e-re
c
urs
i
ve error
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C H
a
mano
F
i
x dependency of commo
n
-cmd
s
.
h
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
RPM spec: incl
u
de git-p4
i
n th
e
list of all packages
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C Hamano
rerere: make sortin
g
r
e
al
l
y stable
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C
Hamano
Fix sw
i
t
c
hing to a branch with D/F w
h
e
n
current bra
n
c
h
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hama
n
o
Fix tw
o
way_m
e
rge t
h
at
pas
s
ed
d
/f conflict marker
t
o
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Hamano
Fix read-
t
ree --pr
e
fi
x
=dir/
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
u
n
io C Hamano
unpack-trees:
ge
t
rid of *in
d
pos para
m
eter
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
unpack_t
r
ees
.
c:
pass
unpa
c
k_
t
rees_
o
pt
i
ons s
t
r
u
cture
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io
C
Hamano
add_cach
e
_entry(): removal
o
f
f
ile foo
d
o
es not conflict
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge b
r
anc
h
'j
c
/
b
isect
'
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Hamano
Merge branch 'fl/
d
o
c'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ha
m
ano
M
erge branc
h
'pos
t
1
.
5
.
1/blame
.
el
'
commit
|
commitdiff
|
tree
2007-04-04
J
u
ni
o
C H
a
m
a
no
Merge branch 'pos
t
1
.
5
.
1/tcltk'
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
ama
n
o
M
e
rge branch '
p
ost
1
.
5
.
1/p4'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge
bran
c
h 'lt/d
i
rwalk'
commit
|
commitdiff
|
tree
2007-04-04
Junio C H
a
mano
git
-
r
e
ad-tree --index
-
out
p
ut=<file>
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ham
a
no
_GI
T
_IN
D
EX_
O
UTP
U
T: allow plumbing
to output to an
a
lter
n
ativ
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
checkout: allo
w
detaching to H
E
AD
even
wh
e
n swi
t
ching
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
amano
G
IT
1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio
C
Hamano
M
e
rg
e
1
.
5
.
0
.
7
in
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
GIT 1
.
5
.
0
.
7
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
re
r
ere shou
l
d
n
ot repe
a
t the earlier
h
unks in
later
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-02
Juni
o
C
Ham
a
no
H
o
pefully
fin
a
l upda
t
e to
the draft Release
Not
e
s,
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-01
Junio C Hamano
Op
t
i
o
n
a
l
T
c
k/Tk:
ignore ge
n
era
t
ed files
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
Do
not bother
document
i
ng fetch--t
o
ol
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
U
p
d
at
e
draft rele
a
s
e
notes for
1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Jun
i
o C Hamano
Merg
e
b
ranch 'maint'
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
M
erge branch 'mas
t
er
'
of git://
r
epo
.
or
.
cz/git
/
mergeto
o
l
.
git
commit
|
commitdiff
|
tree
2007-03-28
Junio C
Hamano
Do
c
u
m
entati
o
n: unb
r
eak user-
m
anual
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Ju
n
io C
Hamano
GIT
1
.
5
.
1-rc3
commit
|
commitdiff
|
tree
2007-03-28
Juni
o
C Hamano
Update m
a
i
n
git
.
html pag
e
to
p
oint at 1
.
5
.
0
.
6 docu
m
entation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
J
u
nio
C Hamano
Merge branch '
m
aint' to synchroni
z
e with 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio
C
Hamano
G
I
T 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C H
a
mano
Fix
"-
-
p
r
etty=format:"
for pa
r
ent r
e
late
d
items
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
git-co
m
mit:
"
r
e
ad-t
r
ee -m HEAD" is not
t
he right way
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Junio C Haman
o
sha1_file
.
c (write
_
sha1_fil
e
):
Detect close failure
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next