repo.or.cz
/
git
/
fastimport.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Fix crash in t0020 (crlf conversion)
2007-04-22
Juni
o
C H
a
mano
Update d
r
af
t
release note
s
for v1
.
5
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C Haman
o
Documentat
i
on/Makefile: fi
x
section (5) ins
t
allation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Haman
o
Update docum
e
ntation links to p
o
int a
t
v1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
J
u
n
i
o C
H
amano
Merge br
a
nc
h
'lt/
o
bjalloc'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merg
e
branch 'jc/a
d
d'
commit
|
commitdiff
|
tree
2007-04-22
Jun
i
o
C
Hamano
Merg
e
b
ranch
'
j
c
/attr
'
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C Hamano
Me
r
ge bra
n
c
h
'lt/git
l
ink'
commit
|
commitdiff
|
tree
2007-04-22
Junio C H
a
ma
n
o
Merge
br
a
nch '
n
p/pa
c
k'
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C
Hama
n
o
M
e
rge bran
c
h 'jp/refs'
commit
|
commitdiff
|
tree
2007-04-22
Jun
i
o C Hamano
Merge branch 'jc
/
qui
c
k
fetch'
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
io C Ham
a
no
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2007-04-21
Junio
C Hamano
GIT
1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Juni
o
C Hamano
lockfile: record the primary p
r
ocess
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C H
a
mano
co
n
vert
.
c: restructure th
e
attribute
chec
k
ing part
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Jun
i
o C Hamano
Fix bogus
l
i
nked-list
manageme
n
t fo
r
user defined merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
git-clone: fix dumb protocol transport to cl
o
ne from
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Ju
n
i
o
C H
a
m
ano
git-add -u: matc
h
the index
with working tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hama
n
o
M
erg
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-20
Junio C H
a
mano
D
ocument gita
t
tribut
e
s(5)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Update
'crlf' attribute
s
e
m
a
n
tics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio
C Hamano
Documen
t
ati
o
n: suppo
r
t manual sec
t
ion (5) - fil
e
fo
r
mats
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
Merge branc
h
'
m
ai
n
t'
commit
|
commitdiff
|
tree
2007-04-19
Junio
C Hama
n
o
Sim
p
lify code to find recurs
i
ve m
e
r
g
e dri
v
e
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
J
u
nio C Hamano
Counto
-
fix in merge-recursive
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C Hamano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ha
m
ano
F
i
x f
u
nny types used in attribute
v
al
u
e representa
t
i
on
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Allow low-level driver
t
o spec
i
fy
d
i
fferent
behavi
o
ur
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Hamano
Custom lo
w
-leve
l
m
erge dr
i
ver: change the config
u
ration
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
unio C Haman
o
All
o
w
t
he
default low-l
e
vel m
e
r
ge driver t
o
be conf
i
gur
e
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C
Hamano
Custom low-le
v
el merge d
r
iver supp
o
r
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C Hamano
M
erge branch
'fl
/
cvsserver'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o
C Hama
n
o
Upd
a
te
d
r
a
f
t release n
o
tes fo
r
1
.
5
.
2
with accumulated
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
unio C Ham
a
no
Me
r
ge branch '
m
aint
'
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Hamano
Star
t
prepa
r
i
ng for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Junio C
Hamano
Mer
g
e
branch 'master' of git://re
p
o
.
or
.
c
z
/git-gui
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C Hamano
Merge
b
ra
n
c
h 'mai
n
t' of git://re
p
o
.
o
r
.
c
z
/git
-
gui into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
J
uni
o
C
H
amano
Merge branch '
j
c/read-tree-
d
f'
commit
|
commitdiff
|
tree
2007-04-17
J
unio
C Hamano
Add a demonstration/test of customized mer
g
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
u
nio C Hamano
Allow
specifyi
n
g specialized merge-backend per path
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
u
nio C Hama
n
o
git-gui
:
Hono
r
TCLTK_PATH if
s
uppli
e
d
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
merge-recursive: separate
out
x
dl_merge() interface
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io
C
H
ama
n
o
A
llow more than true/false to attribu
t
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Juni
o
C
Ham
a
n
o
Mak
e
sure quic
k
fetch is not f
o
oled wi
t
h a previ
o
us
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Junio
C
Ham
a
n
o
M
erg
e
br
a
nch 'js/wrap-log
'
commit
|
commitdiff
|
tree
2007-04-16
J
u
nio C Hamano
send-email: do n
o
t leave an emp
t
y CC: l
i
n
e if no cc
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2007-04-16
Junio
C
H
a
m
a
no
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-15
Junio
C
Ha
m
ano
Change attribute negation marker from '!' to
'-'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Ha
m
a
no
Defi
n
e a b
u
i
lt-i
n
att
r
ibute mac
r
o "binary"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
attribute macro
support
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Mak
e
f
i
le: add patch
-
ids
.
h back
in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
Hamano
Fix 'dif
f
' attribute
semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
uni
o
C Hamano
Fix
'crlf
'
a
ttribute semanti
c
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hama
n
o
Merge git:/
/
g
it2
.
kernel
.
org/pub/scm/gitk/gitk into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C
Ha
m
ano
Teach
'
diff'
about 'diff
'
attribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Define 'crlf' attribut
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C
H
a
ma
n
o
Add basic infrastr
u
c
ture to assign att
r
ibutes to pa
t
h
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
J
unio C Hama
n
o
Merge bra
n
ch
'maint'
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
R
eplac
e
a pair of pat
c
h
e
s with updated ones
f
or subpr
o
ject
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
i
o
C Hamano
D
o
n
o
t default
to --
n
o
-
ind
e
x when given t
w
o di
r
ectories
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Junio C
Hamano
M
e
rge branch 'jc/cher
r
y'
commit
|
commitdiff
|
tree
2007-04-13
Jun
i
o C Hamano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-13
Junio C H
a
mano
F
ix git
{
log
,
s
h
o
w
,
.
.
.
} --prett
y
=
email
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Juni
o
C
Hamano
Docum
e
ntatio
n
: --
c
herry-pick
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
git-
l
og
-
-cherry-pick A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Refactor patch-id filtering out
o
f gi
t
-cherry and git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Add %m to '--p
r
etty=for
m
at:'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
M
e
rge branch 'maint
'
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
i
o C Haman
o
GIT 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Jun
i
o
C Hamano
fsck: do not com
p
lain on detached HE
A
D
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
Merge b
r
an
c
h
'
maint'
commit
|
commitdiff
|
tree
2007-04-10
J
u
n
io
C
H
aman
o
g
it-fe
t
ch: us
e
f
e
tch--tool pick-rref to avoid
local
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C
Hama
n
o
gi
t
-fetc
h
--tool pick-rref
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io C Hamano
t3030: merge-recur
s
ive
backend test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
u
nio C Hama
n
o
me
r
ge-recursive: handle D/F conflic
t
case mor
e
carefully
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
merge-re
c
ursive
:
do not
ba
r
f on "to be removed" en
t
ries
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Ham
a
no
Treat
D
/F co
n
fli
c
t
en
t
ry more carefull
y
in unpack-trees
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C
Hamano
t
1
000: fix case tabl
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
u
nio C Hamano
shortlog -w:
m
ake wrap-line beh
a
vi
o
u
r optional
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
J
u
nio C Hamano
M
e
rg
e
branch
'
j
c
/
pus
h
'
commit
|
commitdiff
|
tree
2007-04-09
Junio C
H
amano
Merge branch 'jc/me
r
ge-subtr
e
e'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio
C Hamano
Merge branch '
j
s/fetch-progre
s
s'
commit
|
commitdiff
|
tree
2007-04-09
J
u
nio C Hamano
M
erge b
r
anch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
A
dd
Documentation/cmd-lis
t
.
made to
.
gitigno
r
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Juni
o
C
H
amano
St
a
rt 1
.
5
.
2 cycle by p
r
ep
a
reing RelNote
s
for it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Ham
a
n
o
Merge bra
n
ch
'
jc/r
e
ad-t
r
ee-df'
(
early part)
commit
|
commitdiff
|
tree
2007-04-08
J
unio C Hamano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-08
Jun
i
o C Hamano
Prepare
f
or
1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
A new merge strage
t
y
'sub
t
ree
'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o
C Hamano
git-pus
h
to
mul
t
iple l
o
c
a
ti
o
ns doe
s
not
st
o
p at the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C
H
amano
git-push reports the URL afte
r
f
ailing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
unio
C
H
amano
Mer
g
e bran
c
h
'jc/
i
n
dex-outpu
t
'
commit
|
commitdiff
|
tree
2007-04-07
Junio C
Hamano
Merge
b
ranc
h
'fp/make-j'
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
m
a
n
o
M
e
rge branch 'cc/bisect
'
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio C Hamano
Merge b
r
a
nc
h
'jc/c
h
eckout'
(
early part)
commit
|
commitdiff
|
tree
2007-04-07
Junio C
Haman
o
M
erge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C
Ham
a
no
Documentation:
t
ighten
d
ependency for g
i
t
.
{html,txt}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o C Hamano
g
it-bisect:
a
llow bise
c
t
ing with o
n
ly one b
a
d commit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ha
m
ano
t
6030: add a
bit more tests to git-bisect
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next