repo.or.cz
/
git
/
vmiklos.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jc/add'
2007-04-22
J
uni
o
C Hamano
M
e
rge b
r
anch 'jc/add
'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
M
e
r
g
e bra
n
ch
'
jc/
a
ttr
'
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
io
C
Hamano
Merg
e
b
ranch 'lt/gitlink'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
M
er
g
e branch 'np/pack'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Mer
g
e branch 'jp/refs'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge branch 'j
c
/qu
i
ckfetch'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge br
a
n
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-21
Junio C Ha
m
ano
GIT 1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C
H
amano
lockfile: record the
p
rimary p
r
ocess
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Ju
n
io C Hamano
convert
.
c: restructur
e
the
a
ttri
b
ute
c
hecking part
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Juni
o
C Hamano
Fix bogus li
n
ked-list manageme
n
t
for
u
ser d
e
fi
n
ed merg
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Jun
i
o
C
Ha
m
a
no
git-
c
lone: fi
x
dumb
protoco
l
transport
to c
l
one fr
o
m
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
J
u
nio C Ha
m
a
no
g
i
t
-add -u
:
match the inde
x
with working tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
M
erge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-04-20
Junio C Haman
o
D
ocument gitattributes(5)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C H
a
m
a
no
Update '
c
rlf' attr
i
bute se
m
a
ntics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
D
ocum
e
ntatio
n
: suppo
r
t manual section (5) - file form
a
ts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Ju
n
i
o
C
Ha
m
ano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-19
Junio
C
Hamano
Simplif
y
cod
e
to f
i
nd recursi
v
e mer
g
e driv
e
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
Cou
n
to
-
fix
i
n
m
erge-recursive
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C Hamano
Merge branch
'main
t
'
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Ham
a
no
Fix f
u
nny t
y
pes
u
sed in a
t
tribut
e
v
a
lue representatio
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
A
l
lo
w
low-level dri
v
er to spec
i
fy differen
t
behaviour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Ham
a
no
Custom low-
l
eve
l
m
e
rge driver: change the co
n
figu
r
ation
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C Hamano
Allow the default low
-
le
v
el merge drive
r
to be
c
o
nfigured
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C Ha
m
ano
C
u
stom low
-
level me
r
g
e
dr
i
ver support
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C
Ham
a
no
Merge branch 'fl/cvss
e
rver'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ha
m
an
o
Merge branc
h
'main
t
'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
U
p
date draft release
notes for 1
.
5
.
2
w
ith a
c
cumulated
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
M
e
rge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Hamano
Start pr
e
parin
g
for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C Hamano
Me
r
ge
b
r
a
nch 'master'
o
f g
i
t://repo
.
or
.
cz/g
i
t-gui
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Hamano
Merge
b
ran
c
h
'm
a
int' o
f
git://repo
.
or
.
cz
/
git-gui
into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Jun
i
o
C Hamano
Merge b
r
a
n
ch 'j
c
/read-tr
e
e-
d
f'
commit
|
commitdiff
|
tree
2007-04-17
Jun
i
o C Hamano
Add
a de
m
onstration/
t
e
st
o
f customized me
r
ge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Allow sp
e
c
i
fying sp
e
cialized me
r
ge-b
a
c
k
end per p
a
t
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
u
nio C Hamano
g
i
t-gui: Honor
TCLTK_PAT
H
if sup
p
lie
d
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Juni
o
C
Hama
n
o
m
e
r
ge-recursive
:
separate out xdl
_
merge() interface
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
u
nio C Hama
n
o
Allow more t
h
an true/
f
alse to
a
t
t
ributes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C H
a
mano
Make sure quickfetch i
s
not fo
o
led
w
i
t
h a previous
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Junio C
H
amano
Merge branch 'js/
w
ra
p
-log'
commit
|
commitdiff
|
tree
2007-04-16
Jun
i
o C Hamano
send-email: do not leave an empty
CC:
line if no c
c
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
M
e
r
g
e b
r
anch
'
maint'
commit
|
commitdiff
|
tree
2007-04-16
Junio C H
a
mano
M
erge branc
h
'
m
a
i
nt'
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o C Hamano
C
hange attri
b
u
te n
e
gat
i
o
n marker from '!' t
o
'
-
'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
H
a
mano
Define a built-in at
t
r
ibute macro "b
i
nary"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Haman
o
attribu
t
e
macro support
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o
C
Ham
a
no
Makefile: add patch-ids
.
h b
a
c
k
in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C
Hamano
F
i
x
'
diff' attribute
s
emanti
c
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Juni
o
C
Hamano
Fi
x
'crlf' attribute semanti
c
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io C Hamano
Merge git:/
/
git
2
.
kernel
.
org/pub/
s
cm/
g
itk/gitk into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Teach 'd
i
ff' about 'diff' attrib
u
t
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
J
uni
o
C Hamano
Define 'crlf' attribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C Ham
a
n
o
Ad
d
basic infrastructu
r
e
to as
s
ign attributes to paths
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-14
J
unio C Hamano
Replace
a
pai
r
o
f patches wi
t
h updated one
s
f
o
r sub
p
r
o
ject
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C Hamano
Do not default to --no-index when given two directorie
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
J
unio C Haman
o
Merg
e
b
ran
c
h '
j
c
/
c
h
erry'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Merge br
a
nch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-13
J
u
nio
C
Hamano
F
ix git {log,show,
.
.
.
} --pretty=email
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Juni
o
C Hamano
Doc
u
mentatio
n
: -
-
cher
r
y-p
i
ck
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
H
a
mano
git-log -
-
cherry-pick A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Refactor
p
atch-
i
d
f
il
t
e
r
i
ng out of git-che
r
r
y
and g
i
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o
C Hamano
Add
%m to '--pretty=format:'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-12
Junio C H
a
mano
GIT 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Junio C Hamano
fsck: do not complain on d
e
tached HEAD
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Jun
i
o
C Haman
o
M
e
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-10
J
u
nio
C
Hamano
g
it-fetch:
use fetch--tool pick-rref to avoid local
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
g
i
t-fetch--tool pick-rref
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
uni
o
C Hamano
t3030: merg
e
-recursive
b
ackend test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
merge-recursive: ha
n
d
l
e D/F conflict
c
as
e
more
ca
r
efully
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hama
n
o
merge-re
c
u
rsive: do not barf on "to be removed" entries
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C H
a
man
o
Treat D/F confli
c
t entry more care
f
u
l
ly in
u
npack-trees
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C
H
amano
t1000: fix case table
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C H
a
mano
sh
o
rtlog -
w
: make wra
p
-line behaviour option
a
l
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Juni
o
C Hama
n
o
Merg
e
branch 'jc/push'
commit
|
commitdiff
|
tree
2007-04-09
J
unio
C Hama
n
o
M
e
rge branc
h
'jc/merge-
s
u
btree'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Haman
o
M
e
rg
e
br
a
nch
'js/fetch-progress'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Me
r
ge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
Junio
C Hamano
Ad
d
D
ocumentati
o
n/cmd-list
.
made to
.
gitignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Start 1
.
5
.
2 c
y
cl
e
by prepa
r
eing RelNotes for it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
J
unio
C
Hamano
Merge branch
'jc/read-tree-df'
(e
a
rly part)
commit
|
commitdiff
|
tree
2007-04-08
Ju
n
i
o C
H
a
mano
Merge br
a
n
c
h '
m
aint'
commit
|
commitdiff
|
tree
2007-04-08
J
un
i
o
C
Hamano
Pre
p
a
r
e for 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
unio C Ham
a
no
A new merge s
t
r
agety 'sub
t
ree'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C Hamano
git-push t
o
mu
l
tip
l
e locations
d
oes not sto
p
at the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
git
-
pus
h
reports the URL
a
fter failing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ha
m
ano
Merge br
a
nch 'jc
/
index-output'
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Ham
a
no
Merge b
r
anch 'fp/
m
ake-j'
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C Hamano
Merge bra
n
ch 'cc
/
bisect'
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C H
a
mano
Merge branch '
j
c/checko
u
t' (early
p
art)
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Documen
t
atio
n
:
t
i
g
ht
e
n de
p
e
nd
e
ncy for git
.
{htm
l
,txt}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
git
-
bisect: allow b
i
secting with
only on
e
bad commit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
t
6030: add a bit mor
e
tests
t
o git-b
i
s
e
ct
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Ju
n
io C
H
amano
git-b
i
se
c
t: modernizat
i
on
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Jun
i
o C Hamano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Rename add_fi
l
e_to_index()
t
o
add_f
i
le_t
o
_cache()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
J
u
nio C Hamano
Rename
s
t
atic variable
w
rite_in
d
ex
to
u
pdate_index
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next