repo.or.cz
/
git
/
dscho.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 H
a
m
a
no
Counto-fix in merge-rec
u
r
siv
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C
Hamano
Fix f
u
nny ty
p
es used in
a
ttribu
t
e value repre
s
entation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ha
m
ano
All
o
w
low-level d
r
iver t
o
specify
d
iffe
r
e
n
t beh
a
v
i
o
u
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Haman
o
Custom low-l
e
vel
merge driver: change t
h
e
configu
r
ation
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
un
i
o C Hamano
Allow the de
f
ault
low-level merge d
r
i
ver
to be co
n
figured
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
a
man
o
C
u
stom low-level
m
erge driv
e
r suppo
r
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
u
nio C Hamano
Add a d
e
monstration/test of customized merg
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Jun
i
o C
Hamano
Allow spe
c
ifying
s
pecialized merge-ba
c
k
e
n
d
p
e
r path
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
u
nio C Hamano
merge-recursive: s
e
parate out xdl_mer
g
e() int
e
rf
a
ce
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Al
l
ow mor
e
than true/false to
attribu
t
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
James Bowe
s
Do
c
ume
n
t
g
it-check-attr
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Juni
o
C
Hamano
Ch
a
nge attri
b
ute neg
a
tion
m
arke
r
from '!'
t
o
'-'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Juni
o
C Hamano
Define a built-in attrib
u
te
macro "binary"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
a
t
tribute macro support
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Makefile
:
add patch-id
s
.
h bac
k
in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Fix 'diff' attribute
s
emant
i
cs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Fix 'c
r
lf' a
t
tribute s
e
mantics
.
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 'diff' att
r
i
bute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Jun
i
o C
H
a
m
ano
D
efine 'crlf' attribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Jun
i
o C Hama
n
o
A
dd bas
i
c infras
t
ructure to ass
i
gn attribut
e
s to
p
a
t
h
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
J
u
nio
C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-14
L
i
nus Torvalds
git-quiltimport
comp
l
aining yet s
t
ill working
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Frank
L
ichtenheld
config
.
txt: Fix
g
rammatical error i
n
description of
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Frank Lic
h
tenheld
config
.
txt
:
Chan
g
e ps
e
r
v
e
r to server
in d
e
scri
p
tio
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Frank Li
c
htenheld
config
.
t
xt: D
o
cument c
o
r
e
.
autocrlf
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Fr
a
nk Licht
e
nheld
conf
i
g
.
tx
t
:
Document g
i
t
cvs
.
a
llbina
r
y
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C
H
amano
Do not d
e
fault to --no-index when given
two directo
r
i
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Ale
x
R
i
esen
U
s
e
rev-list --reverse in git-rebase
.
sh
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Merge br
a
nch 'jc/
c
herry'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Merge branc
h
'maint
'
commit
|
commitdiff
|
tree
2007-04-13
Matthias Lederhofer
h
andle_options in
git w
r
a
p
p
er
miscount
s
the o
p
tions
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Fix git {log
,
s
how,
.
.
.
} --pretty=email
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Shawn O
.
P
earce
Don
'
t yap ab
o
u
t merge
-
subtree
d
u
ring make
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o C
H
am
a
n
o
Doc
u
mentation: -
-
cherry-pick
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
u
nio C Hamano
g
i
t-l
o
g --cherry-pick
A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Refactor p
a
tch-i
d
filte
r
ing out of git-
c
herry and
g
it
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
u
n
io
C Hamano
Add %m
t
o '--p
r
etty=fo
r
mat:
'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Jim Meyeri
n
g
s
s
ca
n
f/strtoul: parse in
t
egers
robu
s
tl
y
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Robin H
.
J
ohnson
Add
testca
s
e for f
o
rmat-pa
t
c
h --subje
c
t-
p
refix (t
a
ke 3)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
R
ob
i
n
H
.
Johnson
Add cust
o
m
s
ub
j
ect prefi
x
sup
p
ort to
fo
r
mat-p
a
tch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
M
er
g
e
bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-12
J
unio
C Hamano
G
IT 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Fran
k
Lic
h
tenheld
c
vsserver: Fix
h
a
n
dling of
d
iappeare
d
f
iles on
u
pdat
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Junio C Hama
n
o
fsck: do not co
m
pla
i
n on
d
etached HEAD
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Jim Meyering
(
e
ncode_85, deco
d
e_85): Ma
r
k
sou
r
ce b
u
ffer poi
n
ter
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
F
r
ank Li
c
htenheld
gitweb: Allow configu
r
ing the defaul
t
proj
e
cts order
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Frank Lichtenhel
d
gitweb: Allow forks
w
i
th project lis
t
fil
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
Mer
g
e branch
'
ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-10
Julian Philli
p
s
Documentatio
n
: show-re
f
: document
--exclude
-
e
x
isting
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Tomash Brechko
cvsexpor
t
com
m
it
-
p :
f
i
x the usage of gi
t
-apply -C
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
René S
c
ha
r
fe
gi
t
-
a
rchive: make tar the default format
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio C
Hamano
Merge branch '
j
c/push
'
commit
|
commitdiff
|
tree
2007-04-09
Junio C H
a
mano
Merge
b
ranch 'jc/merge
-
subtree'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio C H
a
mano
Me
r
ge branch 'j
s
/fetch-p
r
ogr
e
ss'
commit
|
commitdiff
|
tree
2007-04-09
Juni
o
C Ham
a
no
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
Junio
C Ham
a
no
Add Documentation/cmd-list
.
made to
.
gitigno
r
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Eric Wong
git-svn: fix log command to a
v
oid infinite loop on
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Eric W
o
ng
git-svn:
dc
o
mmit/rebase confu
s
e
d by p
a
tches
w
ith git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
E
r
i
c Won
g
git-svn: bail
out
on
inc
o
rrect
comman
d
-l
i
ne 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 cycle by prepa
r
e
i
ng RelNotes f
o
r it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Ju
n
io
C Haman
o
M
e
rge branch
'jc/read
-
t
r
ee-df'
(
early
part)
commit
|
commitdiff
|
tree
2007-04-08
Junio C Haman
o
Merge
br
a
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Prepa
r
e f
o
r 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
F
r
a
nk
Lichtenh
e
ld
cv
s
s
erve
r
: small corrections
t
o as
c
iidoc doc
u
m
entat
i
on
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C Hamano
A new m
e
rge
s
trage
t
y 'sub
t
re
e
'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
unio C Hamano
git-push
to multiple loc
a
tions 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 Hamano
g
it-push
reports t
h
e
URL after
f
a
i
l
ing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
unio
C Ha
m
ano
Merge bra
n
ch
'jc/index-out
p
ut'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Mer
g
e
branch 'fp/make-j'
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio C Hamano
M
e
rge branch 'cc/bisect'
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
mano
Merge branch 'jc/checkout' (early part)
commit
|
commitdiff
|
tree
2007-04-07
Junio C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
Hamano
D
o
cument
a
tion: tighten depende
n
cy for git
.
{html,txt}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Arjen Laarhoven
Ma
k
efi
l
e: ico
n
v
() on
D
arwi
n
has the old interface
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Arjen Laarhov
e
n
t
5
30
0
-
pack-ob
j
ect
.
sh: p
o
rtability i
s
s
ue
u
sing /usr
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C Ha
m
a
n
o
git-bisect:
a
llow bisecting with only one bad commit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
Hamano
t60
3
0: add
a b
i
t mor
e
tests to git-b
i
sect
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Arje
n
L
a
a
rhoven
t
3
2
00-branch
.
s
h
:
s
mall language nit
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Arjen L
a
arho
v
en
user
m
anual
.
tx
t
: some capitali
z
a
t
ion nits
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Lars Hjemli
Make builtin-branch
.
c ha
n
dle the
g
i
t
c
on
f
i
g
file
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
L
ar
s
Hjemli
rename_ref(): o
n
ly print a warn
i
ng whe
n
config-file
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Bria
n
Ge
r
n
h
ardt
Disting
u
ish bran
c
h
es
b
y more
than case in tests
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
YOSHIFUJI Hideaki
.
.
.
Avoid comp
o
sing too long "R
e
ferences" header
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
F
r
ank Licht
e
nheld
cvsimport
:
I
m
prove for
m
at
i
ng consi
s
te
n
cy
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Frank Lichtenheld
c
v
simpo
r
t: Reo
r
d
er options in do
c
umentation
f
or better
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Frank Li
c
h
tenheld
cvsimport: Impr
o
ve
u
sage error reporting
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
F
rank Lichte
n
h
el
d
cvsimport: Impro
v
e
documentation
o
f CV
S
RO
O
T and CVS
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Frank L
i
chtenheld
cvsimpor
t
: sync usage
l
in
e
s with exis
t
ing optio
n
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Junio C Hamano
git-bisect: mo
d
ernization
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Ju
n
i
o C Hamano
M
e
rge branch
'
maint'
commit
|
commitdiff
|
tree
2007-04-05
D
ana How
F
ix lseek
(
2) ca
l
ls wit
h
ar
g
s 2 and
3
s
wapped
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Fe
r
nando
J
.
Pereda
Makefil
e
: Add
'+' to
QUIET_SU
B
DI
R
0 t
o
fi
x
para
l
l
el
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Christian Coude
r
Documentatio
n
: bise
c
t: "start"
a
c
cepts one bad and
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Christian Couder
Bisect: teach
"
bisect start" to option
a
lly
use o
n
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Alex Rie
s
en
Fix passing of TC
L
TK_PATH 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_file_to_ind
e
x() to add_fi
l
e
_
t
o
_
cache()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C
H
amano
Rena
m
e
s
ta
t
ic var
i
able write_index to update_i
n
d
ex
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C
H
amano
Rename
i
n
t
ern
a
l
f
unction "
a
dd
_
f
il
e
_to_ca
c
he" in buil
t
i
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Jun
i
o C Ham
a
n
o
Propagate cac
h
e error in
t
e
rnal to refres
h
_cache()
via
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
J
u
n
io C Hamano
F
ix bogus
e
rror mess
a
g
e from
m
er
g
e
-r
e
curs
i
ve error
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next