repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
lockfile: record the primary process.
2007-04-21
Junio C Hamano
lockfi
l
e
: record the primary proces
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Ju
n
io C Hamano
convert
.
c
:
res
t
r
u
cture the at
t
ribute check
i
ng part
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
Fix b
o
gus l
i
nk
e
d-list management
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
Simplify
calling of CR/LF conversion routines
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
D
ocument gitattributes(5)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Jun
i
o
C
Ham
a
no
U
pdate 'crlf' attribute semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Juni
o
C
Haman
o
D
oc
u
mentation: support manual secti
o
n (5) - file f
o
rmats
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hama
n
o
Si
m
plify code to
find recursive merge driv
e
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hama
n
o
Counto-f
i
x in merge-recursive
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
u
n
io C
H
amano
Fix
f
unny types
u
sed i
n
attribute value repr
e
sentation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
u
ni
o
C Hamano
Allow
l
o
w-level driver
to
s
pecify differe
n
t behaviour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
C
ustom low-level
m
er
g
e
driver
:
change the confi
g
uration
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
A
l
l
ow the defau
l
t low-level
mer
g
e driver to be configured
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C Hamano
Custom
lo
w
-l
e
vel merge dri
v
e
r
suppo
r
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hama
n
o
A
d
d a de
m
o
nstration/test
o
f cus
t
omized
m
erge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io C H
a
m
an
o
Allow specify
i
ng
spe
c
ialized merge-backend
p
er pa
t
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C Ham
a
no
merge-recursive:
s
eparate out xdl_
m
erge() inte
r
face
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ha
m
ano
Allow more
t
han true/fa
l
se
to a
t
tribut
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
James Bo
w
es
Docu
m
en
t
git-check-attr
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio C H
a
mano
Change attr
i
bute negation marker
f
r
om '!'
t
o
'-'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Ha
m
ano
Define
a built-in attribute m
a
cr
o
"
b
in
a
ry"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o C Hamano
attribute ma
c
ro support
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Makefile:
a
dd patch-ids
.
h
b
ack
i
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Ham
a
n
o
Fix 'dif
f
' attribute sema
n
tic
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io
C
Hamano
Fix
'crlf'
a
t
t
ribute semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Jun
i
o C Ha
m
ano
Teach 'diff' about 'diff'
at
t
ri
b
u
t
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio
C
Hamano
Def
i
n
e
'cr
l
f
'
attribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Ham
a
no
Ad
d
b
a
s
i
c infrastru
c
ture to assign
attributes
t
o
paths
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-14
L
i
nus Torvalds
git-quiltim
p
ort complaining yet still working
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Fra
n
k
Licht
e
n
held
config
.
txt:
F
ix gram
m
atical error
i
n
description of
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Fran
k
Lichtenheld
con
f
ig
.
t
x
t:
C
hange pse
r
ver t
o
se
r
ver in description
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Frank
L
i
c
hten
h
eld
config
.
txt
:
Docume
n
t co
r
e
.
autocrlf
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
F
r
a
n
k
Lich
t
e
n
held
config
.
txt: Docu
m
ent gitcvs
.
allbinary
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
J
u
nio C
H
a
mano
Do not def
a
ul
t
to --no
-
index when
g
i
v
en two directories
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Al
e
x
Ri
e
sen
U
se rev-list --revers
e
i
n
git-reb
a
s
e
.
sh
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Ju
n
io C Ham
a
no
Merge bran
c
h
'jc/che
r
ry'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Ham
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-13
Matthias
Led
e
rhofer
h
andle
_
op
t
i
ons in git wrap
p
er miscounts the optio
n
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Fix gi
t
{log,
s
how,
.
.
.
} --pretty=e
m
ail
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Shawn O
.
Pearce
Don't yap about merge-su
b
tree during make
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
Ha
m
ano
Documentation: --
c
h
erry-pick
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
unio C Hama
n
o
git-log --
c
h
erry-pi
c
k A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Refactor patch-id fil
t
ering
out of git-cherry and gi
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
uni
o
C Hamano
Add %m to '--p
r
etty=format:'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
im Meyer
i
ng
sscanf/strtoul: parse
integ
e
rs ro
b
us
t
ly
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Robin H
.
Johnson
Add testcase for fo
r
ma
t
-patch --
s
ubject-prefix (tak
e
3)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Robi
n
H
.
Johnson
Add
c
ust
o
m
subject prefix su
p
por
t
to forma
t
-patch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C H
a
ma
n
o
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-12
Junio C Ha
m
a
n
o
GIT 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Frank
L
ichte
n
held
cv
s
server: Fix
h
andli
n
g of dia
p
pe
a
r
e
d file
s
on upda
t
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Junio C Ha
m
an
o
fsck:
d
o not complain on
d
etached
HEAD
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
J
im Meyering
(encode_85, deco
d
e_85): Mark s
o
urc
e
buff
e
r
p
oi
n
ter
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
F
r
ank Li
c
h
t
e
nheld
gitweb: Allow configuring
the d
e
fault p
r
ojects or
d
er
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
F
rank Li
c
htenhe
l
d
gitweb: A
l
low forks with projec
t
l
is
t
fil
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io C
H
a
m
ano
Me
r
ge bra
n
c
h 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-10
Jul
i
an Phillip
s
Doc
u
mentation:
show-ref: do
c
um
e
nt --exclude
-
exist
i
ng
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Tomash Brechko
cvsexportcommit -p
:
f
ix the usage of g
i
t-ap
p
ly
-C
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
René Scharfe
git-archive: make
t
ar
t
h
e d
e
f
ault
format
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Jun
i
o C H
a
mano
Merge branc
h
'jc/push'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
M
e
r
ge b
r
anch
'jc/mer
g
e
-
subtre
e
'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
J
u
ni
o
C Hamano
Merge branch 'js/fet
c
h
-
progress
'
commit
|
commitdiff
|
tree
2007-04-09
J
unio C Ham
a
no
Merg
e
br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
J
u
ni
o
C
H
amano
Add Docum
e
ntation/cmd-list
.
made to
.
gitig
n
o
r
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
E
r
ic Wong
g
it-svn: fix
l
og
com
m
a
n
d to avoid infini
t
e loop
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Eri
c
Won
g
git-svn:
d
commit
/
rebase confused
by patches with git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Eric Wong
g
it-svn: bail out on incorrect c
o
mmand-line opti
o
n
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Start 1
.
5
.
2 c
y
cle by prepareing RelNote
s
for it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Ha
m
ano
Merge branch
'jc/read-tre
e
-df' (early p
a
rt)
commit
|
commitdiff
|
tree
2007-04-08
Junio C Ham
a
n
o
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-08
Ju
n
io
C
Hamano
Prepa
r
e fo
r
1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Frank Li
c
htenheld
cvsser
v
er: small
correc
t
ions to asciidoc docum
e
ntat
i
on
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio C Hamano
A new mer
g
e stragety 'subtree'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C H
a
m
a
n
o
git-push to mult
i
p
le locatio
n
s does not s
t
op at the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
unio
C
Hamano
git-push repor
t
s the
U
RL after
f
a
iling
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
u
n
io C Hamano
Merge br
a
nch 'jc/index-output'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ha
m
ano
Merg
e
b
ranch 'fp/make-j'
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io
C
Hamano
M
e
rge branch 'cc/bisec
t
'
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o C Hamano
Merge b
r
anch 'jc/checko
u
t' (early
p
a
r
t)
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Ha
m
ano
M
erge branch
'
maint'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Documen
t
ati
o
n: tighten dependency
f
o
r gi
t
.
{html,txt}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
A
r
je
n
Laarhoven
Mak
e
file: i
c
onv() on
D
arwin has
the old i
n
terface
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Arjen
Laarhov
e
n
t5300-pack-obj
e
ct
.
sh: p
o
r
t
ability issue using /usr
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o C Hama
n
o
git-bisect: allow bisecting with
only
o
n
e
b
ad commi
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
unio
C Ham
a
no
t60
3
0: add a bit more
tests to git-bisect
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Ar
j
en Laarhoven
t
3
200-bra
n
ch
.
sh:
small language nit
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
A
rje
n
Laarhoven
u
sermanual
.
txt: some capi
t
alization nits
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Lars Hjemli
Ma
k
e builtin-br
a
nch
.
c handle
t
he git config f
i
le
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
L
ars Hje
m
li
r
en
a
me_ref():
only print a w
a
rning when
c
onfig-file
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
B
r
i
an G
e
rnhardt
Dis
t
inguish br
a
nch
e
s by more
than case in tests
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
YOSHIFUJI Hid
e
aki
.
.
.
A
voi
d
composing too long
"
Ref
e
renc
e
s" head
e
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Frank Lichtenheld
cvsimport: Im
p
rove forma
t
ing con
s
istency
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Fran
k
Lichtenheld
cvsimport:
Reor
d
er
options in document
a
tion for be
t
t
e
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Frank Licht
e
n
held
c
v
simport: Im
p
r
o
v
e
usage error reportin
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Frank Lichtenheld
cvsimport: Improve
documen
t
a
t
i
o
n of CVSRO
O
T and CV
S
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Frank Lichtenheld
cvsimport: sync usage
lines
with existing options
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Junio C H
a
mano
git-b
i
sect: moder
n
ization
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C Hamano
Merge bran
c
h
'
m
a
int'
commit
|
commitdiff
|
tree
2007-04-05
Dana
H
ow
F
ix 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
.
P
e
red
a
M
a
kefile: Add '+'
t
o QU
I
E
T
_SU
B
DIR0 to fix paral
l
el
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next