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
H
a
m
ano
lockfile: record
t
he primary
process
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Ju
n
io
C Hamano
con
v
ert
.
c: restructure the attribute ch
e
ck
i
ng part
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C
H
amano
F
i
x
bogus linked-list mana
g
ement for
u
se
r
d
efined me
r
ge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Ale
x
R
ie
s
en
Simplify calling
o
f
CR/LF c
o
nversion routines
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Haman
o
Do
c
umen
t
gitattributes(
5
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio
C
Haman
o
Update
'
c
r
l
f
' at
t
ri
b
ute sema
n
tics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
J
u
nio
C Hamano
D
o
c
umenta
t
i
o
n: support manual section (5) - file fo
r
mats
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio
C
Hama
n
o
S
i
m
plify code to find
r
e
c
ursive
merge dri
v
er
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Jun
i
o C Ha
m
ano
Counto-fix in
m
erge-recurs
i
ve
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C
H
amano
Fi
x
funny types used in attribute va
l
ue
r
ep
r
esentation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Ha
m
ano
Allow low-l
e
ve
l
driver
t
o
specify
d
if
f
erent be
h
aviour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C H
a
mano
Cu
s
tom low-
l
eve
l
merge driver: chang
e
the con
f
iguration
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
A
l
low
the defa
u
lt low-level merge
driver t
o
be c
o
n
f
igu
r
ed
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C Ha
m
a
n
o
Custom l
o
w-level merge dri
v
er support
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C
H
a
m
ano
Add a demonstration/test of
custom
i
zed me
r
ge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io C Hamano
Al
l
ow specifying s
p
ecial
i
zed
m
e
r
ge-backend per path
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C
H
ama
n
o
merge-rec
u
rsive: separat
e
out xdl_merge() interface
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
u
nio C H
a
mano
A
l
low more than tr
u
e/fal
s
e
to attributes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
James Bowes
D
ocu
m
ent git
-
c
heck-
a
ttr
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
unio C Hamano
Change attr
i
bute negation
m
arke
r
f
r
om '!' to '-'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Defin
e
a built-in attribute macro "binary"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
attribut
e
macro s
u
pport
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Ham
a
no
Makefi
l
e: add patch-ids
.
h
b
ack in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
H
amano
Fix 'dif
f
'
at
t
rib
u
te
semanti
c
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Fix 'crlf' a
t
t
r
i
b
ute semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C Hamano
T
each '
d
iff' about 'diff' attrib
u
t
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
io C Haman
o
D
e
fine
'crlf'
attribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
A
d
d basic inf
r
astru
c
ture to assign attribut
e
s to
paths
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C
H
am
a
no
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-14
Linus Torva
l
ds
git-qui
l
timport
complaining yet still wo
r
kin
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
F
r
ank Lichten
h
e
l
d
config
.
txt: Fix gr
a
mmatical error in descri
p
tion of
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Frank Lichtenhel
d
config
.
txt: Change pserv
e
r to server i
n
description
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Frank Lic
h
t
enh
e
l
d
conf
i
g
.
txt:
D
ocumen
t
core
.
a
u
tocrlf
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Frank Lichten
h
eld
config
.
txt: Docum
e
nt
g
itcvs
.
allbinary
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
io C Haman
o
Do n
o
t de
f
a
ult to --no-i
n
dex
w
h
e
n given two direct
o
ries
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Al
e
x Riesen
Use re
v
-list -
-
rev
e
rs
e
in git-rebase
.
sh
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
J
u
n
io C Hama
n
o
Merge branch
'
jc/cherry'
commit
|
commitdiff
|
tree
2007-04-13
Junio
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-13
M
a
tthi
a
s Lederh
o
fe
r
h
andl
e
_op
t
ions in g
i
t
wrap
p
er
miscounts t
h
e options
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Fix git
{log,show,
.
.
.
}
--pretty=email
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Shawn O
.
Pearce
Don't yap about merge-subtree
during make
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Haman
o
Docu
m
entat
i
on:
--cherry-pick
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
git-log --c
h
err
y
-
p
ick A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
Hama
n
o
Refactor pa
t
ch-
i
d
fi
l
tering o
u
t
o
f git-c
h
er
r
y a
n
d git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
Hama
n
o
Add
%
m to
'
-
-
p
retty=format:'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Jim Meyering
sscan
f
/strtou
l
: parse integers
r
obustly
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Robi
n
H
.
J
o
hnson
Add testcase
for format-p
a
t
ch --su
b
ject-
p
r
e
fix
(
t
ake 3)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Robin
H
.
Johnson
Add custom subject
p
r
efix suppo
r
t to forma
t
-
p
atch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Merge bra
n
ch
'maint'
commit
|
commitdiff
|
tree
2007-04-12
J
unio C Ham
a
no
GIT 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Frank Lichtenheld
cv
s
server: F
i
x
ha
n
dling o
f
diappeared files on upd
a
te
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
J
u
nio
C H
a
mano
fsck:
d
o not complain on detac
h
ed
H
EAD
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Jim Meyering
(encode_85, decode_85)
:
Mark source buffer point
e
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Fr
a
nk
Lich
t
e
n
held
gi
t
web:
Allow co
n
figuring the de
f
a
u
lt projects order
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Fr
a
nk L
i
chten
h
eld
gi
t
w
eb: Allow
f
orks with project l
i
st fi
l
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-10
Julian P
h
i
llips
Documentation: sho
w
-ref: document
-
-exclude
-
exis
t
ing
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
To
m
ash B
r
echko
cvsexp
o
rtcommit -p :
f
i
x the u
s
a
ge of git
-
apply -C
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
René Scharf
e
git-archi
v
e
:
make tar
t
h
e default format
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio
C Hamano
Me
r
ge
branch
'
jc
/
push'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
M
erge br
a
nch
'j
c
/merge-subtre
e
'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Juni
o
C Hamano
Merge branch 'js/fetch-pr
o
gres
s
'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
M
e
rge br
a
nch
'
maint'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hama
n
o
Add Docume
n
tation/cmd-li
s
t
.
made
to
.
g
itignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Eric Wong
git-
s
v
n
: fix
log comma
n
d
t
o
a
v
oid infinite loop o
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Eric Wong
git-svn: dcommit/rebase
c
onfused by patches with git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Eric Wong
git-svn
:
bail
o
ut o
n
incorrect command-line
o
ptions
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
J
uni
o
C Hamano
S
t
a
rt 1
.
5
.
2 cycle by prepareing RelN
o
t
e
s for i
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Ju
n
i
o
C Hamano
Merge b
r
anc
h
'jc/read-tree-df'
(early part)
commit
|
commitdiff
|
tree
2007-04-08
Junio C Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-08
Junio C Ham
a
no
Prepare
f
or 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Frank
L
ichtenheld
c
v
sserver: sm
a
ll
corre
c
tions t
o
asciidoc d
o
cumentatio
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
A new merge str
a
get
y
'subtre
e
'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
Ha
m
an
o
git-p
u
sh to multiple l
o
cations does n
o
t stop at the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o C Hamano
git-push reports the URL
after failing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ha
m
ano
Merge branch 'jc/
i
n
d
e
x-outpu
t
'
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C
H
a
m
a
no
Merge branch '
f
p/make-j'
commit
|
commitdiff
|
tree
2007-04-07
Junio C
H
amano
Merge bran
c
h
'cc/bisect'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge
b
r
an
c
h
'
jc/
c
heckout' (ea
r
ly pa
r
t)
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Hamano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Haman
o
Documentation: tighten dep
e
ndenc
y
f
or git
.
{
html
,
txt}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Arjen
Laarhoven
Makefile: iconv() on Darwin
h
as the old
i
nterface
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Arjen
L
aarhoven
t5300-pack-obj
e
c
t
.
sh:
portabili
t
y is
s
ue
u
si
n
g /u
s
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio C Hamano
git-bisect: allow bisec
t
ing with only one bad
c
ommi
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
unio C
H
ama
n
o
t
6
030
:
add a bi
t
more tests to
gi
t
-bisect
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Ar
j
e
n Laarhoven
t3
2
00-branch
.
sh: small
l
angu
a
ge
n
it
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
A
rjen
Laarhov
e
n
us
e
rmanu
a
l
.
txt: some capitalization nits
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
L
ars Hjemli
Make
b
uiltin-branch
.
c handle th
e
git config fil
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
L
a
r
s
Hjemli
r
ename
_
ref(): on
l
y pr
i
nt a warning whe
n
config-file
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Bri
a
n G
e
rn
h
ardt
Distinguish
br
a
nches by more than case in te
s
ts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
YOSHIFUJI Hide
a
ki
.
.
.
A
void composin
g
too lon
g
"References" hea
d
er
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Fr
a
nk Lichtenhe
l
d
cvsimpo
r
t:
Improve formating
c
onsistency
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Frank Lich
t
enh
e
ld
cvsimport: Reord
e
r opti
o
ns in do
c
umentation fo
r
bett
e
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
F
rank Lichtenheld
cvs
i
mport: Improve
usage error reporting
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Frank Lichtenhe
l
d
cvsimport: Impr
o
ve
d
ocumentatio
n
of
CVSRO
O
T and CVS
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Frank Lichtenhe
l
d
c
v
simport:
sync usag
e
lines with
e
xisting
o
ptions
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Junio
C
H
a
man
o
git-bis
e
ct: moderni
z
ation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C
Hamano
Merge bran
c
h
'
m
aint
'
commit
|
commitdiff
|
tree
2007-04-05
D
ana
H
ow
F
i
x lseek(2) calls with arg
s
2 and
3 swapped
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Fernando J
.
Pereda
Makef
i
le
:
Add
'
+
'
to Q
U
IET_SUBDIR0 to
f
i
x
parallel
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next