repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Update documentation links to point at v1.5.1.2
2007-04-22
Junio C Ham
a
no
U
pdate documen
t
a
t
ion links to point
at v1
.
5
.
1
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Ham
a
n
o
Merge branch 'lt/objalloc'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge branch 'jc/add'
commit
|
commitdiff
|
tree
2007-04-22
J
unio C Hamano
Merge
b
ranch 'jc/attr'
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
io C
Ha
m
ano
Merge b
r
a
n
ch 'l
t
/gitlink'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merg
e
branch 'np/pack'
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
io C Hamano
Merge branch
'
jp/refs'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
M
erge branch 'jc/quickfetch'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hama
n
o
M
e
r
g
e branch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-21
Ju
n
io C Hamano
GI
T
1
.
5
.
1
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
J
unio C H
a
mano
l
ockf
i
le: rec
o
rd th
e
pri
m
a
ry process
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
convert
.
c: restructure the a
t
tribute
c
hecking part
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Ju
n
io
C Hamano
Fix
bogus linked-lis
t
management for user de
f
ined merg
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
J
u
nio C Haman
o
git-clone: fix dumb protocol
t
ransport to clo
n
e
f
r
om
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
J
unio C Ham
a
n
o
gi
t
-add -u: mat
c
h the index wi
t
h working tree
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Ham
a
no
Mer
g
e branch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-20
J
u
nio C Hama
n
o
D
o
cument gitattributes(5)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
J
u
nio C Ha
m
a
n
o
Updat
e
'crl
f
' a
t
t
r
ibu
t
e
semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C
H
amano
Documentat
i
on: su
p
p
o
rt ma
n
ual section
(5) - file form
a
t
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Jun
i
o
C
Hamano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-19
Jun
i
o C Hamano
Simplify code
t
o find r
e
curs
i
ve merg
e
dri
v
er
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Ju
n
io C Hamano
Coun
t
o-fix
in merge
-
recursive
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
unio C Hama
n
o
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Hama
n
o
Fix
f
u
nny ty
p
es used in att
r
ib
u
te value
r
epresentatio
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C Hamano
All
o
w low-level d
r
iver to specify different beha
v
iour
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ha
m
ano
Cu
s
tom l
o
w
-le
v
el merge driver: change the
configur
a
tion
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Allow the
d
efault low-
l
evel merge driv
e
r
to
b
e
con
f
igured
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
un
i
o
C Hamano
Custom low-level merge driv
e
r s
u
ppo
r
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
un
i
o C Hamano
Me
r
ge branc
h
'fl/c
v
s
serv
e
r'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
M
erge branch 'maint
'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Update draft release no
t
es for
1
.
5
.
2 with acc
u
mul
a
ted
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ham
a
no
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
S
tart preparing
f
or
1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Hamano
Merge bran
c
h 'mast
e
r
'
o
f
g
i
t
://repo
.
o
r
.
cz
/
git-gui
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C Hamano
Merge branch 'maint' of git:/
/
repo
.
or
.
cz/git-gui
i
nto
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
M
e
rge br
a
nch 'jc/read-
t
ree-df'
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
A
d
d a demonstrat
i
on
/
test of cus
t
o
m
ized merge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C
Hamano
Allo
w
specifying spe
c
ialized
merge-backe
n
d per path
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
J
unio
C
Hamano
git-gui: Honor TCLTK_PATH if suppli
e
d
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
m
e
rge-recursive: separate out
xd
l
_
merge() in
t
erface
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ham
a
no
Allo
w
mo
r
e than true/false t
o
attributes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
J
u
nio
C Hamano
M
ake sure quick
f
etch is not fooled with a
previous
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
M
erge
b
ranch
'js/w
r
ap-l
o
g'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
send
-
email:
d
o not
leav
e
an empty CC: line i
f
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 Hamano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-15
Junio
C Hamano
C
h
ange
attri
b
ute negation marker from
'
!' to '-'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
i
o
C Ha
m
ano
Defi
n
e a b
u
ilt-in attribu
t
e ma
c
ro "bi
n
ary"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C
Ham
a
no
attribute ma
c
ro sup
p
ort
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio
C
H
amano
M
a
kef
i
le: add patch-i
d
s
.
h
b
ac
k
in
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o C Hamano
Fix 'diff' attri
b
ute s
e
mantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io C Hamano
F
ix 'crlf' att
r
i
bute semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio C Ham
a
no
Merge git://git2
.
kernel
.
org/pub/
s
c
m/gitk/gitk i
n
to
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
J
unio
C
Hamano
Tea
c
h 'd
i
ff' about 'd
i
f
f' attribu
t
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
io C Hamano
Defin
e
'crlf'
a
ttr
i
bute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Ha
m
ano
Add basic i
n
frastruct
u
re to a
s
sign
attributes to paths
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C
Hamano
Mer
g
e
b
ranch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
i
o
C Hamano
Replace a pair
of patches
with updat
e
d ones fo
r
s
ubpro
j
ect
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C
H
amano
D
o not d
e
fault
t
o --no-in
d
ex
w
hen gi
v
en two
d
irect
o
r
ies
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Junio C Ha
m
ano
Merge branch 'jc/cherry'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Merge br
a
nch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Ha
m
ano
Fi
x
g
it {
l
og,show,
.
.
.
}
--pretty=email
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
u
n
io C Hamano
Docum
e
ntation: --c
h
erry-pick
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
git-
l
o
g
--cherry-pick A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C H
a
mano
Ref
a
ctor patch-id filterin
g
o
u
t of git
-
cherry
a
nd gi
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=forma
t
:'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
u
n
i
o C Hamano
Merge branc
h
'maint
'
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
i
o
C
Ha
m
ano
GIT 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
Juni
o
C
H
a
mano
fsck: do not
c
omplain on det
a
ched H
E
A
D
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
unio C Haman
o
Merge br
a
nch
'maint'
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io C Hamano
g
it-fetch:
use fetch--tool pi
c
k-rref to
avo
i
d local
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
u
n
i
o C Hamano
g
it-fetch--t
o
ol pick-rre
f
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
t3030
:
merge-recursive backen
d
test
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
merge-recursive:
h
andle
D/F co
n
flict case more carefully
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
u
n
i
o
C Ha
m
ano
m
erge-recu
r
sive: d
o
not barf on "
t
o be removed" entries
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io C Hamano
Trea
t
D
/
F con
f
lict entry
mor
e
ca
r
efully 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 table
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io C Hama
n
o
shortlog -w: make wrap-lin
e
behaviour optional
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Jun
i
o
C Hamano
Merge bra
n
c
h
'jc/push'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Haman
o
Merge branch 'jc/merge-su
b
tree'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C
Hamano
M
e
rg
e
branch
'js/fetch-progress'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Ha
m
a
n
o
Add
Document
a
tion/cmd-list
.
mad
e
to
.
gitign
o
re
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Ju
n
io C Hamano
St
a
rt 1
.
5
.
2 cycle by prepareing RelNo
t
e
s
for it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio
C Hamano
Merge
branch
'
j
c
/read-tr
e
e-df'
(earl
y
pa
r
t)
commit
|
commitdiff
|
tree
2007-04-08
Junio C
H
amano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-08
J
u
nio C Hamano
Prepare f
o
r 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 s
t
ragety
'
s
u
btree'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
u
n
i
o C
Hamano
git-push
to multiple loca
t
ions does not s
t
op a
t
th
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
H
a
mano
git-push
r
eport
s
the URL after faili
n
g
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
unio C Hamano
Merge branch
'
jc/index-outp
u
t'
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C Hamano
M
e
rge branch
'
fp/
m
a
k
e-j'
commit
|
commitdiff
|
tree
2007-04-07
Junio C
H
amano
Merge branc
h
'cc/bisect
'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ham
a
no
Merg
e
branc
h
'jc/
c
heckout
'
(early
part)
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C Hamano
D
o
c
umen
t
ation:
t
igh
t
en de
p
endency f
o
r gi
t
.
{h
t
ml,
t
xt}
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio C Hamano
git-b
i
sect: all
o
w bisecti
n
g with on
l
y
one bad
commit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Haman
o
t60
3
0: add a
b
i
t
mor
e
tests to git-bise
c
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Ju
n
i
o C Ham
a
no
git-bisect:
moderniza
t
i
o
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Jun
i
o
C
H
am
a
no
M
erge branch 'maint'
commit
|
commitdiff
|
tree
next