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
Counto-fix in merge-recursive
2007-04-19
Junio
C Hamano
Coun
t
o-fix in merge-rec
u
rsiv
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Fix funny types used in
a
ttribute valu
e
repr
e
sentati
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C Ha
m
ano
Allow low-level driver to spe
c
i
fy di
f
ferent behavio
u
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ha
m
ano
Cus
t
om low-level merg
e
driver:
c
hange
t
he config
u
r
a
tion
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C H
a
mano
Allow t
h
e defau
l
t low
-
level merge driver to
b
e co
n
figured
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C H
a
man
o
Cus
t
om l
o
w
-le
v
e
l
mer
g
e driver sup
p
ort
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C
Hamano
Add a demonstration/
t
es
t
o
f
customi
z
e
d merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ha
m
ano
Allow
s
pe
c
ifying special
i
zed me
r
ge-backend per p
a
th
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ham
a
no
merge-r
e
curs
i
ve
:
separate out xdl_merge()
i
n
t
erfa
c
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C H
a
ma
n
o
Allow more
than true/false to
attri
b
utes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
James Bowes
Document
gi
t
-chec
k
-attr
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Juni
o
C Hamano
Change attribute nega
t
ion ma
r
ker from
'!' to '-'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
i
o
C Hamano
Define a b
u
ilt-
i
n attribute macro "binary"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Haman
o
attrib
u
te
macro support
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o
C
Hamano
Makefile: add
p
atch-ids
.
h ba
c
k in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Fix 'diff
'
attribute semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio C Ham
a
n
o
Fix 'crl
f
'
at
t
ribute semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
J
u
nio C Hamano
Teach 'diff' ab
o
ut 'dif
f
' attribute
.
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
Jun
i
o C Haman
o
Add basic
infrastructure to assign attributes to
paths
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2007-04-14
Linus Torvalds
g
it-quil
t
import compl
a
ining yet still w
o
rking
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
F
r
ank Lichtenhe
l
d
config
.
t
x
t: F
i
x grammatical err
o
r in descr
i
ption of
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Frank Lichte
n
he
l
d
c
o
nf
i
g
.
txt:
C
hange pserve
r
to server in description
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Frank Lichtenheld
config
.
txt: Document core
.
auto
c
rlf
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
F
rank
Lichte
n
h
e
ld
config
.
t
x
t
: Document
gitc
v
s
.
allbinary
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
io C Hamano
Do not de
f
au
l
t
t
o --no-inde
x
when given
t
wo directo
r
ies
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Al
e
x Riesen
Use rev-list --reverse in git-
r
e
b
ase
.
sh
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Merge bra
n
ch 'jc/c
h
erry'
commit
|
commitdiff
|
tree
2007-04-13
Junio C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-13
Matthias Led
e
r
h
of
e
r
handle_options i
n
gi
t
w
rapper miscounts the o
p
t
io
n
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Junio
C
H
amano
Fix
git {log,show,
.
.
.
}
--pretty=
e
ma
i
l
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Shawn O
.
P
e
a
rce
Don
'
t yap about m
e
r
g
e-subtre
e
during m
a
ke
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Documenta
t
i
o
n: -
-
ch
e
rry-p
i
ck
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C H
a
m
ano
git
-
log --cherry-pick A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o C Hamano
Refactor
p
a
t
c
h
-id filt
e
ring out
o
f gi
t
-c
h
erry and gi
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Add %m to
'--pre
t
ty=format:'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
i
m M
e
yeri
n
g
s
s
c
anf/st
r
toul: parse
i
n
tegers robus
t
ly
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Robin H
.
Johnson
Add testcase for
f
ormat-
p
atch --subj
e
ct-prefix
(
take 3)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Robin
H
.
Johnson
Add cus
t
om subj
e
ct prefix
support
t
o format-pa
t
ch
.
.
.
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
u
nio C Hamano
GIT 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Fra
n
k Lich
t
enheld
cvsserver:
F
i
x handling
of diappeared files on update
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
J
uni
o
C Hamano
f
s
c
k
: do not comp
l
ai
n
on detac
h
ed HEAD
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Jim
M
eyering
(enco
d
e_85, decode_85): Mar
k
source buffer
pointer
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Frank Lichte
n
held
gitwe
b
: Allo
w
configurin
g
t
he defau
l
t
proj
e
cts or
d
er
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Frank Lichtenh
e
l
d
gitweb: A
l
low forks
with proj
e
ct list file
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C
Hamano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-10
J
u
l
i
an Phill
i
ps
D
ocumenta
t
i
o
n: show-
r
ef: document --exc
l
ude
-
existing
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Tomash
Brech
k
o
cvsexport
c
o
m
mit
-
p : fix the
u
sage of git-apply
-
C
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
René Scharfe
g
i
t
-a
r
chive: make
tar the defau
l
t fo
r
mat
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
J
unio C
H
amano
Merge branch 'jc/pus
h
'
commit
|
commitdiff
|
tree
2007-04-09
Junio
C Haman
o
Me
r
ge branch 'jc/
m
e
rge-sub
t
r
e
e
'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merge b
r
anch 'js/
f
etch-
p
rog
r
ess'
commit
|
commitdiff
|
tree
2007-04-09
Jun
i
o C Hamano
Me
r
ge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
A
d
d D
o
cumentation/cm
d
-
list
.
m
a
de to
.
git
i
g
n
ore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Eric Won
g
g
it-svn: fix log
c
ommand t
o
avoid
infinit
e
loop o
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Eric
Wo
n
g
git-
s
vn: d
c
ommit/reba
s
e c
o
nfused by
pat
c
hes with git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
E
r
ic Wong
git-svn: b
a
il o
u
t
on incorrect
comm
a
nd-
l
ine options
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Junio C H
a
mano
Start 1
.
5
.
2 c
y
cle by preparei
n
g
R
e
lNotes for it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
J
unio C
H
aman
o
Merg
e
branch 'jc/read-tr
e
e-df' (early part)
commit
|
commitdiff
|
tree
2007-04-08
J
u
n
i
o C Haman
o
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Prepa
r
e
f
or 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
F
ra
n
k Lichten
h
eld
cvsserver: small c
o
r
rect
i
ons to
a
sc
i
i
doc docume
n
tation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C H
a
m
a
no
A
n
e
w
m
e
rge stragety 'subtre
e
'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
git-push to mu
l
tiple loc
a
tio
n
s
does not stop at
th
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C
H
a
m
ano
g
i
t-push reports the
URL aft
e
r f
a
iling
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
unio C H
a
mano
Merge b
r
anch
'
jc/
i
nd
e
x-output'
commit
|
commitdiff
|
tree
2007-04-07
J
unio
C
Hama
n
o
Merge
bran
c
h 'f
p
/mak
e
-j'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ham
a
no
Merge branch 'cc/bisec
t
'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merg
e
branch 'jc/checkout' (early pa
r
t)
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
H
amano
M
e
rge b
r
anch '
m
ai
n
t
'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Documentation: tighten dependency for git
.
{ht
m
l,t
x
t}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Arjen
Laarhoven
Mak
e
f
i
l
e: iconv() on
D
a
rwin has the old interface
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Arjen Laarho
v
en
t
5
300-pack-object
.
sh: port
a
bil
i
ty issue
u
sing /usr
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Hamano
git-bisect:
a
llow bise
c
ting with only on
e
bad comm
i
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
H
amano
t6030: add a bit more te
s
ts to git-bisect
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
A
rje
n
L
aar
h
oven
t3200-bra
n
ch
.
sh: sma
l
l
la
n
g
uage nit
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Arjen Laarhoven
u
sermanual
.
txt: some capit
a
lization nit
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
L
a
r
s Hjemli
Make buil
t
in
-
b
ran
c
h
.
c hand
l
e the git con
f
ig fi
l
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Lars H
j
emli
r
e
n
a
m
e_r
e
f(): on
l
y pri
n
t a
w
arni
n
g
w
hen con
f
ig
-
f
ile
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Br
i
an Gernhardt
Disting
u
ish branches by
m
ore than case in
tests
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
YO
S
HIFUJI Hideaki
.
.
.
Avoid
c
omposing too long "
R
efere
n
ces"
header
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Frank
L
ich
t
enh
e
ld
cvsimpo
r
t: Improve formating c
o
nsistency
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Fran
k
L
ichtenh
e
ld
cvsimport: Reo
r
d
e
r option
s
in
doc
u
m
e
ntation
f
or bet
t
er
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Frank Lichtenheld
cvsim
p
ort: Improve usage
e
rr
o
r rep
o
rtin
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Frank Lichtenheld
c
v
simpor
t
:
I
mprove doc
u
mentation
of CVSROOT
a
n
d
CVS
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Frank
L
ichtenheld
c
vsimport: sync usag
e
lines wi
t
h
exist
i
ng opt
i
ons
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Junio C Hamano
git-
b
isect: modernization
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-05
D
a
na How
Fix l
s
e
ek(2) call
s
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
M
ake
f
ile: Add '+' to QUIET_SU
B
DIR0 to
f
ix parallel
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Christian Couder
Docu
m
entatio
n
:
bi
s
ect: "start" accepts on
e
bad an
d
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Chris
t
ian Couder
Bis
e
ct: t
e
a
ch "bi
s
ect s
t
art"
t
o
optionally use on
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
A
l
ex Riesen
Fi
x
passing of
T
CLTK_P
A
T
H
to
g
i
t-gui
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Ju
n
io C Hamano
Rename add_f
i
le_to_index() to add_f
i
le_to_cach
e
()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
J
u
nio C H
a
mano
Rename sta
t
ic variable write_ind
e
x
to up
d
ate_i
n
dex
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C H
a
mano
Rename in
t
er
n
al f
u
nction "add_file_to_
c
ache
"
in builtin
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Propagate cache error i
n
ternal
t
o refres
h
_c
a
c
h
e
(
) via
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
F
ix bogus error m
e
ssage from merge-recursi
v
e error
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next