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
Allow the default low-level merge driver to be configured.
2007-04-18
Junio C Hamano
Allo
w
the default low
-
lev
e
l m
e
r
g
e driver to b
e
c
onf
i
gur
e
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
amano
C
ustom lo
w
-level mer
g
e
driver
s
u
pport
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Add
a dem
o
nstration/te
s
t
o
f cus
t
o
mized merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
uni
o
C Hamano
All
o
w specifying specialize
d
merge-backend per path
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C
H
ama
n
o
me
r
ge-r
e
cursive: separate out xdl_merge() int
e
r
face
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Allow mo
r
e than true/
f
alse to attribu
t
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Jam
e
s Bowes
Document
g
it-check-
a
ttr
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Cha
n
g
e
a
ttribute negation marke
r
fro
m
'
!
' to '-'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
De
f
ine
a
bu
i
lt-in attribut
e
macro "binary"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C H
a
mano
attribute
macro support
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C
Hamano
M
akefi
l
e
:
add patch-ids
.
h back in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Ham
a
no
F
ix 'diff'
a
ttribute seman
t
i
c
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio
C
Haman
o
F
i
x 'crlf' att
r
ib
u
t
e se
m
antics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C Hamano
Teach 'diff' about 'diff' attribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C
Hamano
Define 'crlf' att
r
ibute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Jun
i
o C Hamano
Add basic infra
s
tructure to assign attributes to paths
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C
H
aman
o
Mer
g
e branch 'mai
n
t
'
commit
|
commitdiff
|
tree
2007-04-14
L
i
n
u
s
Torv
a
lds
git-quiltimport complai
n
i
ng yet
still workin
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Frank
L
ichtenheld
confi
g
.
txt
:
Fix gramm
a
t
ic
a
l
e
rror
in de
s
cription
of
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
F
r
ank Lichtenheld
config
.
txt:
C
h
ange pserver to ser
v
er
i
n description
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Fra
n
k
Lichtenheld
config
.
txt: Docume
n
t c
o
re
.
autocrlf
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
F
r
a
n
k
L
ichtenheld
co
n
f
ig
.
txt:
D
o
cum
e
nt
g
itcvs
.
a
l
l
b
inary
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio
C
Hamano
Do
n
ot
d
ef
a
ult
t
o --no-inde
x
when gi
v
en two d
i
r
ectories
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
A
le
x
Ries
e
n
U
se rev-l
i
st --rever
s
e
in git-reba
s
e
.
sh
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 bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-13
Ma
t
thias Lederhofe
r
handle
_
opt
i
on
s
i
n git
wrapper miscounts the optio
n
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Ju
n
io C Hama
n
o
Fix git
{
log,s
h
ow,
.
.
.
} --pre
t
ty=email
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Shawn O
.
P
ear
c
e
Don
'
t yap a
b
out merge-subtr
e
e d
u
r
i
ng make
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o C Hamano
Documentation: -
-
che
r
ry-pic
k
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
u
n
io C Hamano
git-
l
o
g --
c
he
r
ry-
p
ick A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Ha
m
ano
Ref
a
cto
r
pa
t
ch-i
d
filte
r
ing out of git-
c
herry
and git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C H
a
mano
Add %m to '--pretty=
f
ormat:'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Jim Meyer
i
n
g
sscanf/
s
tr
t
o
u
l: p
a
r
se inte
g
ers rob
u
stly
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Robin H
.
Johnson
Add testca
s
e for format-patc
h
--subj
e
c
t
-pref
i
x (take 3
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Robin H
.
J
ohn
s
o
n
A
dd c
u
stom subje
c
t
prefix support to format-patch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Haman
o
Merge
b
ran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-12
J
unio C H
a
mano
GIT 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Frank Lich
t
enhel
d
cvsserve
r
: Fix handlin
g
of diappeared
files
on update
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Junio
C
H
a
mano
fsck: d
o
not complain on detached
HE
A
D
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Jim
Mey
e
rin
g
(e
n
c
od
e
_
8
5, decode_85): Ma
r
k so
u
r
c
e buffer poin
t
er
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Frank
L
ichtenheld
gitweb:
A
llow
configuring
t
he default projects order
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
F
r
ank L
i
chtenheld
gi
t
web:
A
llo
w
fork
s
with project
l
ist file
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C
Hamano
Merge b
r
anch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-10
Julia
n
Phil
l
ips
Documenta
t
ion: show-re
f
:
document
--ex
c
l
ude-e
x
isting
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Tomash Brechko
cvsexportcommit -p : fix the usage of git-
a
pply -C
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
R
e
n
é Sch
a
rf
e
g
it-archive
:
make tar the defau
l
t fo
r
m
at
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
J
u
nio C Hama
n
o
Me
r
ge branc
h
'jc
/
push'
commit
|
commitdiff
|
tree
2007-04-09
J
u
nio C
H
amano
Merge bran
c
h 'jc/me
r
ge-subtr
e
e'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio
C Ham
a
no
M
erge
branch
'
j
s
/fetch-p
r
o
g
res
s
'
commit
|
commitdiff
|
tree
2007-04-09
Jun
i
o C H
a
mano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Add Docum
e
ntat
i
on/cmd-list
.
made to
.
git
i
gnore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Eri
c
Wo
n
g
git-svn
:
fix
l
og comm
a
nd
to avoid i
n
finite
l
oop on
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Eric
Wong
git
-
s
vn: dcommit/
r
ebase c
o
n
f
used by patches
w
it
h
gi
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Eric Wong
git-svn: bail out on incorrect command-line options
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
J
unio C Hamano
S
tart 1
.
5
.
2
cycle by
p
repar
e
ing Re
l
Notes for it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Merge branch 'j
c
/r
e
ad
-
tre
e
-df' (early par
t
)
commit
|
commitdiff
|
tree
2007-04-08
Ju
n
io C Hamano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-08
Junio
C
H
a
mano
Prepare
for 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Fran
k
Lich
t
enheld
c
vsserver: small co
r
rection
s
to
a
sc
i
idoc documen
t
ation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio C
H
amano
A new merge stragety 'subtree'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
Ha
m
ano
git-pus
h
to m
u
ltiple locations does not
stop at th
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Ha
m
a
n
o
git-push reports the URL after f
a
iling
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Haman
o
Me
r
ge branch 'jc/
i
ndex-out
p
u
t
'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge branch
'
fp/m
a
ke
-
j
'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge branch 'cc/bis
e
ct
'
commit
|
commitdiff
|
tree
2007-04-07
Junio C
Hamano
M
e
r
ge branch '
j
c
/checkout'
(earl
y
part)
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o
C Ham
a
no
Merge branc
h
'main
t
'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Documentati
o
n
: tig
h
ten dep
e
n
dency
f
or gi
t
.
{html,txt}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Arjen Laarhoven
M
a
kefile: ic
o
nv()
on
D
arwin ha
s
the old in
t
er
f
a
ce
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Arjen Laarhoven
t5300
-
pack
-
object
.
sh: por
t
abili
t
y is
s
ue usi
n
g /
u
s
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
g
it-bisect:
a
llow
b
ise
c
ting with o
n
ly
o
n
e
ba
d
commit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
mano
t60
3
0: add a bit more t
e
sts to git-bisect
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Arjen Laa
r
hove
n
t
3
200-branch
.
sh: smal
l
language
n
it
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Arje
n
Laarhoven
usermanua
l
.
t
x
t:
s
o
me capit
a
lization
n
its
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Lars H
j
e
m
l
i
Make builtin
-
branch
.
c han
d
le the
git config file
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Lars Hjemli
r
ename_ref(): onl
y
prin
t
a
w
ar
n
i
ng when
c
onfig-file
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Bri
a
n
G
ernhardt
Di
s
tinguish branches by more than case in te
s
t
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
YOS
H
IFU
J
I
H
id
e
aki
.
.
.
Avoid composing too lo
n
g
"
Re
f
erenc
e
s" he
a
der
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Frank Lichtenheld
cvs
i
mport
:
Improv
e
formating con
s
istency
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Frank Lichtenheld
cvsimp
o
rt: Reorder o
p
tions in documentation for b
e
tter
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Frank Lichtenheld
cvsimport:
Im
p
rov
e
u
sage
err
o
r reporting
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Frank L
i
chte
n
held
cvs
i
m
port: Improve documentati
o
n of CVSROOT an
d
C
VS
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Fran
k
L
i
chtenheld
c
vsimport:
s
ync us
a
ge lines with
exist
i
ng options
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Jun
i
o
C Hamano
git-bisect: modern
i
zation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Ju
n
io C Ham
a
no
M
erge bran
c
h
'maint'
commit
|
commitdiff
|
tree
2007-04-05
Dan
a
H
ow
Fix lseek(2) calls with args 2 and 3 swapped
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Fernando
J
.
Pered
a
Ma
k
efile: Add '+' to
QUIET_SUBDIR0 to fix para
l
lel
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Christian C
o
uder
Documentation: bisect: "start" accepts one bad an
d
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Chris
t
ian Couder
Bisect: tea
c
h
"bisect start" to opt
i
onally u
s
e one
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
A
l
ex Riesen
Fix pass
i
n
g
of TCLTK_PATH to git-gui
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C
Ha
m
a
n
o
Ren
a
m
e
add_f
i
le_to_index() to add_file_to_cache()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Rena
m
e st
a
tic v
a
riable
w
rite_index to u
p
date_index
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Ham
a
no
Rename interna
l
function
"add_fi
l
e_to_cache" in bui
l
tin
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Ham
a
no
Propagate
c
a
c
he erro
r
internal to ref
r
e
s
h
_cache
(
)
via
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C
Ham
a
no
Fix bogus e
r
r
o
r me
s
sage from merge-recursive
error
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Andy
P
arkins
Sho
w
bi
n
ary
f
i
l
e size change in diff --s
t
at
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Shawn O
.
Pe
a
rce
H
onor -
p
<n> wh
e
n applyin
g
git diffs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Juni
o
C Hamano
Fix dependency
o
f common-cmd
s
.
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Shawn O
.
Pe
a
rce
F
i
x
lost-fo
u
nd to
show commits only re
f
erenced by ref
l
ogs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next