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
Fix bogus linked-list management for user defined merge drivers.
2007-04-21
Junio C Hamano
Fix bo
g
us linke
d
-list m
a
nagement for us
e
r defin
e
d merg
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
D
o
cument
git
a
ttributes(5)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
J
un
i
o C Ham
a
no
Update 'crlf
'
a
tt
r
ibute semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Documentation:
support ma
n
ual
s
ection (5) - file format
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
Simpl
i
fy code to find rec
u
rsive merge dr
i
ver
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
C
o
u
nto-fix i
n
mer
g
e
-
recursive
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Fix
funny
types used in attribute va
l
ue
re
p
resentat
i
on
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Allow lo
w
-le
v
el driv
e
r to spe
c
ify
different
beh
a
viour
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C H
a
mano
Custom low-level me
r
ge
dri
v
e
r
: change the confi
g
u
ration
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Allow
t
he default low-lev
e
l merge dri
v
e
r
t
o be
c
o
nfigured
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C
H
amano
Custom lo
w
-
l
e
vel merge driver suppo
r
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
J
u
nio C Hamano
A
d
d a demon
s
tration/test o
f
cust
o
mized merge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C
Hamano
Al
l
ow
s
p
e
cifying
s
pec
i
alized merge-backend per pat
h
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
merge-recursive: separate out xdl_merge() interface
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io C Hama
n
o
Allow more tha
n
true/false to
a
ttribute
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
C
h
ange attribute negati
o
n mark
e
r from '!'
to '-'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io C Hamano
Define a buil
t
-in attribute macro "binary"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio C H
a
mano
attri
b
ute macro
support
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
H
am
a
n
o
Makefil
e
: add pa
t
c
h-ids
.
h back in
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Fix 'di
f
f
'
attribute semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o
C Hamano
F
i
x 'crlf' attri
b
ut
e
sem
a
ntics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
J
unio
C Hamano
Teach 'di
f
f' about 'di
f
f' attribute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C Hama
n
o
Define 'crlf' attr
i
b
ute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
A
d
d
basic infrastructure to assign attribu
t
es to paths
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C Hama
n
o
Merge branch
'
m
a
int'
commit
|
commitdiff
|
tree
2007-04-14
Junio C
Hamano
Do not defaul
t
to --no
-
index
when
g
i
ven tw
o
direc
t
ori
e
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Jun
i
o C
H
amano
M
e
rge b
r
an
c
h 'jc
/
cherry'
commit
|
commitdiff
|
tree
2007-04-13
J
uni
o
C Hamano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
F
i
x git {lo
g
,s
h
ow
,
.
.
.
}
--pretty=email
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
u
nio C Hamano
Docu
m
entation: --
c
h
e
rr
y
-pick
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Ham
a
n
o
g
i
t-log --cherry-p
i
ck
A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
H
a
m
an
o
R
efactor pat
c
h-id filtering
o
u
t of git-c
h
e
rry
a
nd git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Ha
m
ano
Add
%
m t
o
'--p
r
etty=format:'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
u
n
io C
H
a
mano
Mer
g
e branc
h
'maint
'
commit
|
commitdiff
|
tree
2007-04-12
Junio C Ha
m
ano
GIT 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Jun
i
o C Hamano
fsck: d
o
not c
o
mplain on detached HEA
D
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
Mer
g
e
b
ranch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
J
u
ni
o
C
H
amano
M
e
rge
bran
c
h 'jc/
p
ush'
commit
|
commitdiff
|
tree
2007-04-09
J
unio C
Hamano
Merg
e
bran
c
h 'jc/merge-
s
ubtree'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
M
e
rge b
r
anch
'j
s
/fetch
-
progress'
commit
|
commitdiff
|
tree
2007-04-09
Junio C H
a
mano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-09
Junio
C
H
a
mano
Ad
d
Documentation/
c
md-list
.
made to
.
giti
g
nore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C H
a
m
a
no
Start 1
.
5
.
2 cycl
e
by preparei
n
g
RelNotes for it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
J
u
n
io C Hamano
M
erge branch 'jc/read-tree-d
f
' (earl
y
part)
commit
|
commitdiff
|
tree
2007-04-08
J
u
ni
o
C H
a
mano
M
erge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-08
Junio
C
Hamano
P
repare for 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
unio C Hamano
A
new merge str
a
gety 's
u
btree'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
git-push to multiple loc
a
tions
doe
s
not stop at the
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
unio C
H
amano
git-push reports th
e
U
RL afte
r
failin
g
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Hamano
Me
r
g
e branch
'
j
c/index-output'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hama
n
o
M
erge bra
n
ch 'fp/make-j'
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C Hamano
Merge bra
n
ch 'cc/bisect'
commit
|
commitdiff
|
tree
2007-04-07
J
unio C Hamano
Merge bra
n
c
h '
j
c/checkout
'
(early part)
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Mer
g
e branch 'maint
'
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio C Ha
m
an
o
Documentatio
n
:
tighten depe
n
dency for git
.
{ht
m
l
,
txt}
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
u
n
i
o C Hamano
git-bisect: allow bi
s
ecting w
i
th onl
y
one bad commit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C H
a
m
a
no
t6
0
30: add a bit more t
e
sts
to g
i
t-bis
e
ct
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Junio C Hamano
git-bi
s
ect: moder
n
iz
a
t
i
on
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Ju
n
io C
Ham
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-05
Jun
i
o C Hamano
Rename
a
d
d_file_to_i
n
d
e
x
() to add_file_to_cache()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Ju
n
io C Hamano
Re
n
a
m
e static var
i
able write_index t
o
update_index
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Re
n
ame
i
nter
n
al function "add_fil
e
_to_cache" in builtin
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Propagate
c
ache
e
rror in
t
ernal to refresh_ca
c
h
e
(
)
v
ia
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
J
u
nio C Hamano
Fix bogus error message from merg
e
-recursive err
o
r
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Ju
n
io C Ha
m
ano
Fix dependency o
f
common-cmds
.
h
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
H
a
m
a
n
o
R
PM sp
e
c: i
n
clud
e
git-p4 in t
h
e list of al
l
packages
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
unio C Hama
n
o
rerere: mak
e
sorti
n
g really stable
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Fix s
w
itching to a branch with D/F
w
hen current branch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hama
n
o
F
ix
t
woway_m
e
r
g
e t
h
at p
a
ssed d/
f
conflict mark
e
r
to
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C Hamano
Fi
x
read-tree --prefix=dir/
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
unpack-t
r
ees: get rid
o
f *indpos parameter
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C Hamano
unpack_
t
r
e
e
s
.
c: pass unpack_trees_o
p
tions
structure
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C
H
amano
a
dd_
c
ac
h
e_entry(): rem
o
val of
f
ile
foo does not
c
onflict
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Ham
a
no
Merge branch
'jc/bisect'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merg
e
branch '
f
l/doc'
commit
|
commitdiff
|
tree
2007-04-04
Junio
C Hamano
Merge bra
n
ch 'post1
.
5
.
1
/blame
.
el'
commit
|
commitdiff
|
tree
2007-04-04
J
unio C
H
amano
Merge
b
ranch 'p
o
st1
.
5
.
1/tcltk'
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C Ham
a
no
M
e
rge branch 'post1
.
5
.
1/p4'
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Hamano
M
e
rge branch 'lt/
d
irwalk'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
git-
r
ead-tree
--index-outp
u
t=
<
file
>
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C Hamano
_GIT_INDEX_OUTPUT:
a
llo
w
plum
b
ing to o
u
tput to an
a
l
t
ernativ
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hama
n
o
ch
e
ckout: al
l
ow
d
etachi
n
g
to HEAD even
when swit
c
hin
g
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Haman
o
GIT 1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Me
r
ge 1
.
5
.
0
.
7
in
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C H
a
mano
GIT
1
.
5
.
0
.
7
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C Hamano
rerere should not
re
p
eat the
e
a
r
lier hunks
i
n later
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-02
Junio C Hamano
H
opefully final
update to the draft Release Notes,
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-01
J
u
n
i
o C Ha
m
ano
O
p
tion
a
l Tck/T
k
:
i
gn
o
re
ge
n
er
a
te
d
files
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
J
u
nio C Hamano
Do not
b
other documenting fetch--tool
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio
C
Ha
m
ano
U
p
date draft
r
elease notes
for 1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Juni
o
C
Haman
o
Merg
e
branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hama
n
o
Merge
b
ranch 'master' of git:
/
/repo
.
or
.
cz/git/
m
ergetool
.
git
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
Documentation: un
b
reak user-man
u
al
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
G
I
T
1
.
5
.
1-rc3
commit
|
commitdiff
|
tree
2007-03-28
Junio
C
Haman
o
Update main git
.
htm
l
p
a
ge
t
o point at 1
.
5
.
0
.
6 docume
n
tation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Junio
C
Hamano
Merge branch 'm
a
int'
to synchro
n
ize with 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
GIT
1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C
Hamano
F
i
x
"--
p
r
etty=format:
"
fo
r
par
e
nt
relat
e
d items
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Ju
n
io
C Hamano
git-commit: "read-tree -m HEAD" is not
t
he
right way
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
J
u
n
i
o
C Ham
a
no
s
ha1
_
file
.
c (write_s
h
a1_file):
D
etect close fai
l
ure
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next
