repo.or.cz
/
git
/
haiku.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Documentation: support manual section (5) - file formats.
2007-04-20
J
u
nio C
H
a
m
ano
Docum
e
n
t
ation: support m
a
nu
a
l
sect
i
on (
5
) - fi
l
e
f
ormats
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio C H
a
mano
Simplify code to
f
i
n
d recursive 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
i
n merge-recursive
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
amano
Fix fu
n
ny types us
e
d
i
n a
t
tr
i
b
u
te value repre
s
entati
o
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C Ha
m
a
n
o
Allo
w
low-le
v
el driver to specify d
i
fferent beh
a
vi
o
ur
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C Ha
m
ano
C
ustom low-level merge dr
i
ver: c
h
ang
e
the configuration
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C
H
amano
All
o
w the default low-level merge driver to be co
n
f
i
gured
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C Hamano
Custom l
o
w-level merge
driver supp
o
rt
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C
Haman
o
Add a demonstrati
o
n
/
test of customized m
e
rge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
J
unio
C
Hamano
Allow specify
i
ng
s
p
ecialized merge-backe
n
d pe
r
p
ath
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
merg
e
-
rec
u
rsive: separate out xdl_me
r
ge()
inte
r
fac
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ha
m
a
no
Allow more than tru
e
/false t
o
attributes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C Hamano
Chang
e
attribute
nega
t
i
on
mar
k
er from
'!' to '-'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
u
ni
o
C Haman
o
Define a bui
l
t-in attribute
macro "binary"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Ha
m
a
no
a
t
tribute m
a
cro supp
o
r
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
H
amano
Makefile: add
patch-ids
.
h
back
in
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o C Hamano
Fix 'di
f
f' attribute
s
ema
n
t
ics
.
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
J
unio
C Hamano
Teach 'd
i
ff' about 'di
f
f' a
t
tribu
t
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio
C Haman
o
Def
i
n
e 'crlf' attr
i
b
ute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C H
a
ma
n
o
Add basic infrastructure to assign attribut
e
s to paths
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Merge
bra
n
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hama
n
o
D
o
not default to -
-
no-index when given two dire
c
tories
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Juni
o
C H
a
m
a
no
Merge branch 'jc
/
cherry'
commit
|
commitdiff
|
tree
2007-04-13
Jun
i
o
C Hamano
Me
r
g
e branch
'
m
ai
n
t
'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Ha
m
ano
Fix git {lo
g
,show,
.
.
.
} --pr
e
tty=ema
i
l
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Documentati
o
n: --cherry-pick
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
g
it
-
l
o
g --ch
e
rry-pick
A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Refactor patch-id filtering o
u
t of git-cherry and git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Juni
o
C
H
am
a
no
A
d
d %m t
o
'--pretty=format:'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o C Haman
o
Mer
g
e branch 'maint'
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 Ha
m
ano
f
s
c
k: do not
c
omplai
n
on detac
h
ed H
E
AD
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hama
n
o
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merg
e
branch 'jc/push'
commit
|
commitdiff
|
tree
2007-04-09
J
unio C
Hamano
Merge br
a
nch 'jc/merge-subtree'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
J
u
nio C Hamano
M
e
rge bra
n
ch
'
js/fetch-prog
r
ess'
commit
|
commitdiff
|
tree
2007-04-09
Junio
C
Hama
n
o
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
Juni
o
C Hamano
Ad
d
Documen
t
ation/
c
md-li
s
t
.
m
ade to
.
git
i
gnore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Haman
o
Start 1
.
5
.
2 cycle by prepareing Re
l
N
o
t
e
s
for it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
J
unio C Ha
m
a
n
o
Merg
e
br
a
n
ch '
j
c/rea
d
-tree-df'
(
e
arly p
a
r
t)
commit
|
commitdiff
|
tree
2007-04-08
Junio C Haman
o
M
e
rg
e
b
ra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-08
Jun
i
o C Ham
a
no
P
r
epare for 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
unio C
H
ama
n
o
A new merge
s
t
r
agety 'subt
r
ee'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio C Hamano
gi
t
-
p
ush to mul
t
iple loc
a
tions does not
stop at the
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
unio
C
Hamano
git-push reports the URL afte
r
failing
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio C Hamano
Merge branch 'jc/index-o
u
tput'
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o C Haman
o
Merge branch 'fp/ma
k
e-
j
'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hama
n
o
Me
r
ge bra
n
ch 'cc/bise
c
t'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge branch '
j
c/
c
heckou
t
' (earl
y
part)
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io
C
Hamano
Merg
e
branch
'
maint'
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o C
Haman
o
D
ocument
a
tion: tighten depende
n
cy
fo
r
git
.
{html
,
txt}
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
mano
git-bisec
t
: allow bisecti
n
g with on
l
y one bad commit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
unio
C Hamano
t60
3
0: add
a
bit
m
ore
tes
t
s t
o
gi
t
-bisect
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Junio C Hama
n
o
git-bisect: moder
n
ization
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Ju
n
io C Hamano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-04-05
Junio
C Hamano
Rename
a
dd_
f
ile_to_in
d
ex() to add_file_
t
o
_
c
ache()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C
H
amano
Ren
a
me static variable
w
rite_
i
ndex to upd
a
t
e
_index
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Haman
o
R
e
name intern
a
l
f
u
ncti
o
n
"add_f
i
le
_
to_cac
h
e" in
built
i
n
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Ju
n
io C Hamano
P
r
opagate cache error internal to refresh_cach
e
() via
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Ha
m
ano
Fix
bogus er
r
or message fr
o
m merge-recursive
e
rror
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
J
u
nio C H
a
mano
Fix
d
ependency of common-cmds
.
h
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o
C
H
amano
RP
M
spec: include g
i
t
-
p4 in the
l
ist of all pa
c
kages
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ha
m
ano
rerere: m
a
ke sorting rea
l
ly stable
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C
H
amano
F
ix switching to a
bra
n
ch with D/F when c
u
rrent branch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hama
n
o
F
ix tw
o
w
a
y_merge t
h
at pa
s
sed
d
/
f
c
onflict m
a
rker to
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
F
i
x
r
ead-tree --
p
refix=
d
ir/
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o
C Hamano
u
n
pack
-
trees: get rid of *indpos parameter
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
unpack_trees
.
c
:
pass unp
a
c
k
_
trees_op
t
i
o
ns struct
u
re
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
add_cach
e
_entry(): removal
o
f
fi
l
e fo
o
does not conflict
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C Ha
m
a
no
Merge bra
n
ch 'jc
/
bis
e
c
t'
commit
|
commitdiff
|
tree
2007-04-04
J
u
ni
o
C Hamano
Me
r
ge b
r
anch 'fl/doc
'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge
b
r
anch 'post1
.
5
.
1/blame
.
e
l
'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
M
erge branch 'po
s
t1
.
5
.
1/tcltk'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge branch 'post1
.
5
.
1/p4'
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C Hamano
Merge branch 'lt/dirwal
k
'
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
am
a
no
git-read-tree --index-output
=
<file>
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o
C Hamano
_GIT_INDE
X
_OUTPUT:
all
o
w plumbin
g
to output to
a
n alternat
i
v
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio
C
Hamano
chec
k
out: allow detaching to H
E
AD even whe
n
switching
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ha
m
ano
GI
T
1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge 1
.
5
.
0
.
7 in
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
amano
GIT
1
.
5
.
0
.
7
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C H
a
mano
rerere shoul
d
not repeat the
e
arlie
r
hunks in later
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-02
Junio C Hamano
Hopefu
l
ly
f
i
n
al update to the draft R
e
lease Notes,
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-01
Jun
i
o
C Hamano
Optional Tck/Tk: ig
n
o
r
e
g
enera
t
e
d
fi
l
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
Do not bother d
o
cumentin
g
f
e
tch--tool
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Ju
n
i
o C H
a
mano
Up
d
ate dra
f
t release note
s
for 1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Ham
a
no
Mer
g
e branch '
m
a
i
nt'
commit
|
commitdiff
|
tree
2007-03-30
J
u
nio C Ham
a
no
Merge branch
'
master
'
of git
:
//r
e
po
.
or
.
cz/git/mer
g
etool
.
git
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
Documenta
t
ion: unbreak user-manu
a
l
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Ha
m
an
o
G
IT 1
.
5
.
1-rc3
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
Update main
g
it
.
ht
m
l page to
poi
n
t
a
t 1
.
5
.
0
.
6
documentation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
J
u
nio
C Hama
n
o
Merge branch
'maint' to
sync
h
r
o
nize 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
J
unio
C
H
ama
n
o
Fix "--pretty=format:" for parent related i
t
e
m
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Jun
i
o C Hamano
git-commi
t
: "
r
ead-tree -
m
HEAD" is not the right way
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
J
u
nio C
H
amano
sha1_file
.
c (write_sha1_file): Detect
c
lose failur
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
J
unio C Ha
m
a
no
Document
g
it
-
log --first-parent
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-26
Junio C Hamano
GIT 1
.
5
.
1-rc2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-26
Junio C Hamano
M
e
rge branc
h
'jc/fpl'
commit
|
commitdiff
|
tree
next
