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
unio
C Ham
a
n
o
F
i
x
b
ogus l
i
nked-lis
t
managemen
t
f
or user defined merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Al
e
x
R
iesen
S
impli
f
y calling of CR/LF con
v
e
r
sion routines
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio
C
H
amano
D
ocument gitat
t
ributes(5)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C
Hamano
U
pdate 'crlf' attribute sema
n
tics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Documentat
i
on
:
s
u
pport manual
s
e
ction (5) -
f
ile forma
t
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
J
u
n
io C Hamano
Simplify code to find r
e
c
ursive
m
e
rg
e
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
mer
g
e-recursi
v
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Fix fu
n
ny t
y
pes
used
in a
t
trib
u
te value repres
e
nta
t
ion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Allow low
-
lev
e
l driv
e
r
to specify different b
e
hav
i
our
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C H
a
mano
Cu
s
tom
l
ow-level m
e
rge driver: c
h
ange the conf
i
gur
a
tion
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Hamano
A
llow
t
he d
e
f
ault l
o
w-level merge dr
i
v
e
r t
o
be
c
onfigured
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
amano
C
u
st
o
m low
-
level
merge dr
i
ver sup
p
ort
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C
Hamano
Add a demons
t
ration/test
o
f cu
s
tomized
m
erge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
A
llo
w
spec
i
fying
s
pecia
l
ized mer
g
e-backe
n
d per path
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
u
ni
o
C Haman
o
m
e
rge-
r
ecursive:
separate out xdl_merge(
)
inte
r
face
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Jun
i
o C Hamano
A
l
l
ow more than true
/
fals
e
t
o
att
r
ibutes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
James Bowes
Doc
u
me
n
t git-c
h
ec
k
-a
t
t
r
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Change att
r
i
b
ute negation
m
arker
from '
!
' to
'
-'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Define a built-in attri
b
ute macro "binary"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Juni
o
C Haman
o
attribu
t
e m
a
cro s
u
pport
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
i
o C Ha
m
ano
Makefile: add p
a
tc
h
-ids
.
h
bac
k
in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
unio
C
Hamano
Fi
x
'
d
iff'
attr
i
bute se
m
antics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
Hamano
F
i
x
'cr
l
f' attribute semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio
C
Hamano
Teach 'diff'
about
'diff'
a
ttribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Define 'crlf' attribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
io C Hama
n
o
Add basic infrastructure
t
o
a
s
sign attributes to
paths
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
J
unio C Haman
o
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-14
L
i
nus Tor
v
alds
git-quiltimpor
t
complaining yet
s
t
ill working
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Frank Lichtenheld
con
f
ig
.
txt:
F
ix
g
rammatic
a
l error
in des
c
ription of
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Fr
a
nk L
i
chtenheld
con
f
i
g
.
t
x
t: Ch
a
n
g
e pserver to server in descript
i
on
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
F
r
ank Lichte
n
held
config
.
tx
t
: Document core
.
autocrlf
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Frank Li
c
ht
e
nheld
config
.
txt: Document
g
i
tcvs
.
allbin
a
r
y
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
J
u
n
io C Hamano
D
o not
d
ef
a
ult to --
n
o-index when giv
e
n two directories
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Alex
R
iesen
U
se rev-l
i
st --reverse in g
i
t-rebase
.
sh
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Jun
i
o C Hamano
Merge
b
ranch 'jc/cherry'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hama
n
o
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-13
Matthias Lederhofer
h
a
ndle
_
options in git wr
a
pper miscou
n
ts the o
p
tions
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hama
n
o
Fix gi
t
{
log,show,
.
.
.
} --pretty
=
email
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
S
hawn O
.
Pe
a
rce
D
on't
ya
p
a
bout me
r
ge-subtr
e
e during ma
k
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
Ham
a
no
Documentation: --cher
r
y-pick
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
u
nio C Hamano
git-log
-
-ch
e
rry-pick A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
io C
H
aman
o
Re
f
actor patch
-
id filtering out of g
i
t-cher
r
y and git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C
Ham
a
no
A
d
d
%m to
'
--pretty=f
o
rmat:'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Jim
M
ey
e
ring
ssc
a
nf/strtoul: p
a
rse i
n
te
g
e
r
s
ro
b
ustly
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Robin H
.
Johnson
Add tes
t
case for format-patch --subjec
t
-prefix (ta
k
e
3)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Rob
i
n H
.
Johnson
Add cu
s
t
om subject prefix support to form
a
t-patch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
u
ni
o
C
Hamano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o
C Hamano
G
IT 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Fra
n
k
L
ichtenhe
l
d
cvsserver: Fix ha
n
d
ling
o
f dia
p
peared fil
e
s on update
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Junio C Hamano
fsck:
do
n
o
t
comp
l
ain
o
n detached HEAD
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
J
i
m M
e
yering
(en
c
ode
_
85, decode
_
85): Mar
k
source buffer pointer
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Frank
L
i
ch
t
enheld
gi
t
web: Allow
c
o
n
f
igur
i
ng
t
he
default
pro
j
ects orde
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Frank L
i
chte
n
hel
d
gi
t
w
e
b: Allow fo
r
ks with project l
i
st file
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
Me
r
ge bra
n
ch 'ma
i
n
t
'
commit
|
commitdiff
|
tree
2007-04-10
Julian Phillips
Docume
n
tation: sh
o
w-ref: document --excl
u
de
-
existing
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Tomash Brec
h
ko
cv
s
exportcommit -p : f
i
x
t
h
e
usa
g
e of git-
a
pply -C
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
R
e
né Scharfe
git-archive: ma
k
e tar the de
f
ault format
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Ju
n
io C Hamano
M
erge branch 'jc/push'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merge branch 'jc/
m
e
r
ge-subtree'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Jun
i
o C
Hamano
Merge
branch 'js/fet
c
h-p
r
ogr
e
ss'
commit
|
commitdiff
|
tree
2007-04-09
J
u
nio
C
Hamano
Me
r
g
e branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Ham
a
no
Add Documentation/cmd-li
s
t
.
made
t
o
.
gitignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Eric Wo
n
g
git-sv
n
: fix log
c
ommand to avoid infinite
l
oop on
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
E
r
ic Won
g
git-sv
n
: dcomm
i
t/rebas
e
con
f
u
s
ed by
patches wit
h
git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Eric Wong
git-svn: bail
o
u
t
on in
c
orrect comma
n
d-
l
ine options
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Junio C
H
amano
Start 1
.
5
.
2
c
ycle
b
y prepareing
R
elNot
e
s f
o
r
i
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
J
u
n
io C Ha
m
ano
Merge branc
h
'jc/read-tre
e
-
d
f' (early part)
commit
|
commitdiff
|
tree
2007-04-08
Junio
C
Ham
a
no
Merge bra
n
c
h
'maint'
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Prep
a
re for 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Frank Lic
h
tenheld
cv
s
se
r
ver
:
s
m
all cor
r
ec
t
io
n
s to asci
i
doc
d
ocumentation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
uni
o
C H
a
mano
A
new
merge stragety 'subt
r
ee'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio C
Haman
o
git-push to multi
p
le
l
o
cations does n
o
t s
t
o
p
at the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C
H
am
a
no
git-pus
h
reports the URL af
t
er failing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Hamano
Merge branch
'jc/index-output'
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
Hamano
Merge branch
'fp/make-j'
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
mano
Merge br
a
nch 'cc/bisect'
commit
|
commitdiff
|
tree
2007-04-07
J
unio C Hamano
M
erge bra
n
c
h
'jc/c
h
eckout' (early
p
a
rt)
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Mer
g
e bran
c
h
'
m
a
int'
commit
|
commitdiff
|
tree
2007-04-07
Junio C
H
a
m
ano
Docum
e
ntat
i
on: tighten depe
n
dency for
git
.
{html,txt}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Arjen Laarhoven
Makefi
l
e
:
ic
o
n
v
() on
Darwin has t
h
e old interface
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Arjen Laar
h
oven
t5
3
00-pack-object
.
sh: p
o
rtab
i
lit
y
issue us
i
ng /u
s
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
Hamano
g
it-bisect
:
allow bisecting
with on
l
y on
e
bad c
o
m
m
it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
Hamano
t
6030: a
d
d a
b
it
more
te
s
ts to git-bisect
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Ar
j
en Laarhoven
t3200-
b
ranch
.
sh: small la
n
g
ua
g
e nit
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Arjen Laa
r
hoven
usermanual
.
txt: some
c
apitaliz
a
tion ni
t
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
L
a
rs Hjemli
M
ak
e
b
u
iltin-br
a
n
c
h
.
c handle the g
i
t
c
o
nfig file
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Lars Hj
e
mli
renam
e
_r
e
f():
o
n
ly p
r
int a wa
r
nin
g
when config-f
i
le
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Brian Ge
r
nhardt
D
i
s
tingu
i
sh branches b
y
more tha
n
cas
e
in tests
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
YOSHIFUJI
Hid
e
aki
.
.
.
Av
o
id composing too long "References" header
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Frank Licht
e
nheld
cvsimport:
I
mpr
o
ve formati
n
g consis
t
ency
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Frank Lichtenh
e
ld
cvsimpor
t
: Reorder options in doc
u
mentation for better
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Frank Li
c
htenheld
cvsimport: Improv
e
us
a
ge error reporting
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Fr
a
n
k Lichte
n
held
cvsimpor
t
: I
m
p
r
ove documenta
t
ion of
C
VSROOT
and CVS
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Frank Lichtenhe
l
d
cv
s
i
mport: sy
n
c usage lines wi
t
h ex
i
s
t
i
n
g opt
i
ons
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Junio C Hamano
g
it-bise
c
t: mo
d
ern
i
zation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Juni
o
C Hamano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-05
Da
n
a How
Fix lseek(2) calls
w
i
t
h args 2 and 3 swapp
e
d
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Fernan
d
o J
.
Pereda
Makefile:
A
d
d '+' to QUIET_
S
UB
D
I
R0 to fix paralle
l
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Chri
s
tian Couder
Docum
e
n
t
ation
:
bise
c
t: "start"
accepts one bad and
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Christian Couder
Bisect:
t
each
"b
i
sect start" to optio
n
ally use one
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next