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
J
u
n
i
o C Hamano
Fix bogus linked-
l
ist management for user defined mer
g
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Alex Riesen
Sim
p
l
ify
calling of CR/LF conversion rout
i
nes
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Document gitattributes
(
5)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio
C Hamano
Update
'crlf
'
a
ttr
i
bute semanti
c
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Jun
i
o C H
a
mano
D
o
cu
m
entat
i
on: support manual s
e
ction (5)
-
f
ile fo
r
mats
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Juni
o
C
H
amano
Simpl
i
fy cod
e
to find recursive merge driv
e
r
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
Counto-fi
x
in merge-recursive
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C Hamano
Fi
x
funny types us
e
d in attribute value represe
n
tati
o
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
amano
Allow l
o
w-
l
evel driver to specify different behaviour
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
u
n
i
o C Hamano
C
u
s
tom low-level merge dr
i
ve
r
: change
t
he configur
a
tio
n
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C Hamano
Allo
w
the d
e
fault low-level me
r
ge driver to
be configu
r
e
d
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
a
mano
Custom low-level merge driver support
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Add a d
e
monstrat
i
on/test
o
f custo
m
ize
d
merge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
J
u
n
i
o C Hamano
Allow speci
f
ying specia
l
ized
m
erge-b
a
cke
n
d per
path
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
merg
e
-recursive: separa
t
e out xdl_merge
(
)
i
nterface
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
J
unio C Hamano
Allow
more than true/false to attributes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
ames Bowes
Document git-check-attr
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io C Hamano
Change attrib
u
te negation marker from '!' to
'-'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hama
n
o
D
e
fine
a b
u
il
t
-in attribut
e
macro "b
i
nary"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hama
n
o
attribute macro su
p
port
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
H
amano
Makefile:
a
dd patch-ids
.
h back in
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
H
a
mano
Fix 'd
i
f
f
' attribute s
e
mant
i
c
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
F
ix 'crlf' attr
i
bute s
e
mantic
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Teach 'di
f
f'
a
bout '
d
i
f
f
' at
t
ribute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C
H
a
m
ano
D
efine
'
c
rl
f
' attr
i
bute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Add basic infrastructu
r
e
t
o
a
ssign
attributes to paths
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio
C
Hamano
M
erge branch
'
main
t
'
commit
|
commitdiff
|
tree
2007-04-14
Lin
u
s
Torvalds
g
i
t
-
quil
t
impo
r
t complaining y
e
t still working
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Frank Lichte
n
held
c
o
n
fig
.
txt: Fix grammatical error in descrip
t
ion
o
f
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Frank L
i
chten
h
el
d
config
.
tx
t
: C
h
ange pserver to server in description
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Fran
k
Lichtenheld
config
.
txt: Document core
.
auto
c
rlf
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Frank
L
ichtenheld
config
.
t
x
t:
D
ocument gitcvs
.
allbina
r
y
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Do not de
f
ault to
--no-index wh
e
n
given two dir
e
ctories
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
A
l
ex Ries
e
n
U
se rev-list --
r
e
v
e
r
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 br
a
nch 'jc/cher
r
y'
commit
|
commitdiff
|
tree
2007-04-13
J
u
nio C
Hamano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2007-04-13
M
a
tthias
Lederhofer
handle_
o
ptions in git wrap
p
er mi
s
count
s
the
o
ption
s
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Fix git {l
o
g,sh
o
w,
.
.
.
} --p
r
e
t
t
y=email
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Shawn O
.
Pea
r
ce
Don't
y
a
p
about merge
-
subtree during make
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
u
n
io
C
Hamano
Documentation
:
--cherry-pick
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
git-log --
c
herry-pick
A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Ham
a
no
R
efactor patch-id filter
i
ng out of git-ch
e
rry a
n
d
git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
io C Ham
a
no
Add
%
m
to '--pretty=format:'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
i
m
Meyering
sscanf/str
t
o
ul: parse integers robustl
y
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Robin H
.
Jo
h
nson
Ad
d
testcase
f
o
r format-
p
a
tch --subject-pr
e
fix (take 3
)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Robin
H
.
Johnson
Add c
u
stom subject prefix sup
p
o
rt
t
o form
a
t
-
patch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Merge branch
'm
a
int'
commit
|
commitdiff
|
tree
2007-04-12
J
u
nio C
Hamano
GIT 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Frank Lich
t
enheld
c
vs
s
erver: F
i
x handling of diap
p
e
ared fi
l
es o
n
updat
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Junio
C
Hamano
fsck:
do n
o
t complai
n
on detache
d
H
E
AD
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Jim Meye
r
i
n
g
(
en
c
o
d
e_85, decode_85):
M
ark sou
r
ce
b
uffer pointer
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Fran
k
Lichtenh
e
l
d
gitweb: Allow configuring the default projects order
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Frank
L
ic
h
tenh
e
l
d
gitweb: Allo
w
f
o
r
k
s
with project list file
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
Me
r
ge
b
r
anc
h
'main
t
'
commit
|
commitdiff
|
tree
2007-04-10
J
u
lian
P
hillips
Doc
u
menta
t
ion: show
-
ref: document --
e
xclude-existing
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Tomash B
r
echko
cvs
e
xpo
r
tcommit
-
p : f
i
x th
e
u
sage of git
-
apply -C
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
René Scha
r
fe
g
i
t
-archi
v
e
:
make tar
t
h
e def
a
ul
t
format
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Ju
n
io C H
a
m
ano
M
e
rge branch 'jc
/
push'
commit
|
commitdiff
|
tree
2007-04-09
Junio C
Hamano
M
er
g
e
b
ranch 'jc/m
e
rge-s
u
btree'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merge branch 'js/
f
e
t
ch-progress'
commit
|
commitdiff
|
tree
2007-04-09
Juni
o
C Hamano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-09
J
u
nio C
Hamano
Add Documentation/cm
d
-list
.
m
ade
to
.
g
i
t
ignore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Eri
c
Wong
gi
t
-svn: fix
l
og com
m
an
d
to avoid inf
i
nite loop on
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Eric Wong
g
it-s
v
n:
d
c
ommit/rebase confu
s
e
d by pa
t
ches
with git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Eric Wo
n
g
git-svn: bail out on incorrect c
o
mmand-lin
e
opti
o
ns
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C
H
a
ma
n
o
Start 1
.
5
.
2 cycle by prep
a
reing RelNotes for
i
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Ham
a
no
Merge
b
ran
c
h 'jc/read-tre
e
-df' (early par
t
)
commit
|
commitdiff
|
tree
2007-04-08
Junio C Ham
a
n
o
M
erge br
a
nch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-08
Junio C
Ha
m
a
n
o
Prep
a
re
f
or 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
F
rank Licht
e
nhel
d
cvsserver: small correcti
o
ns
to as
c
iidoc docum
e
ntation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
A
new mer
g
e
stragety 's
u
btree'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
H
a
m
ano
git-push to multiple locations d
o
es not stop at the
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio C H
a
mano
git-push repo
r
ts the UR
L
after faili
n
g
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
unio C H
a
mano
Merge b
r
an
c
h
'jc/index-o
u
tpu
t
'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge branch 'f
p
/make
-
j
'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge branch 'c
c
/bisec
t
'
commit
|
commitdiff
|
tree
2007-04-07
Junio C
H
amano
Me
r
ge bra
n
ch 'jc/checkout' (early
p
art)
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio C Hamano
Merge bran
c
h
'maint'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Docu
m
entation: tight
e
n depe
n
d
ency for git
.
{html,txt}
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Arjen Laarhoven
Makef
i
le: iconv() on
Darwin has the old
i
n
t
e
r
f
ace
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Ar
j
e
n Laarhoven
t
5
300-pack-
o
bjec
t
.
sh: portabili
t
y
issu
e
u
s
ing
/
usr
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ha
m
ano
g
i
t-bise
c
t: allow bisecting with only o
n
e bad commit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o C Hamano
t
603
0
:
add a bi
t
more te
s
ts to g
i
t-bisec
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Arjen Laarhov
e
n
t3
2
00
-
branch
.
sh: small language n
i
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Ar
j
e
n Laarhove
n
usermanual
.
txt: some
capitalizatio
n
nits
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Lars
Hje
m
li
Make bu
i
ltin-br
a
nch
.
c hand
l
e
t
he gi
t
config file
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
La
r
s Hjemli
r
e
name_ref()
:
o
nly
p
r
int a
war
n
i
n
g
w
h
e
n config-file
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Bri
a
n Gernhardt
Distingui
s
h bra
n
ches by more t
h
an case in tests
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Y
O
S
H
IFUJI Hideaki
.
.
.
A
v
oi
d
composing too long "References" head
e
r
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Frank
L
ichtenheld
c
vs
i
mport
:
Improve
formating consistency
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Frank Lichtenheld
cvsimpor
t
: Reor
d
e
r
o
pt
i
on
s
in documentation
for better
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Fra
n
k Lichtenheld
cvsimport: Imp
r
ove us
a
ge err
o
r reporting
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Frank Lichtenheld
c
v
si
m
port: Impro
v
e documentation of C
V
S
R
OOT an
d
CVS
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Frank Li
c
htenhel
d
cvsim
p
ort: syn
c
us
a
ge lines w
i
th
exis
t
ing options
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Juni
o
C Hamano
git-bisect: modern
i
za
t
ion
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C Ha
m
ano
Merge bran
c
h '
m
aint'
commit
|
commitdiff
|
tree
2007-04-05
Dan
a
How
Fix lseek
(
2)
calls w
i
th arg
s
2
and 3
swap
p
ed
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Fernando
J
.
Per
e
da
Ma
k
e
f
i
le: Add
'
+' to QUIET_SUBDIR0 to fix parall
e
l
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Christian Couder
Documentation: bisect: "sta
r
t" a
c
cept
s
one bad and
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
C
h
ristian
Coude
r
Bisect: teach "bisect s
t
art"
to op
t
ionally use one
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next