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
lockfile: record the primary process.
2007-04-21
Junio C Hamano
lockfile: record the primary process
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
c
onvert
.
c: restructu
r
e the
a
tt
r
ibut
e
che
c
king
p
art
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Juni
o
C
H
a
man
o
F
i
x bo
g
us li
n
ked-list management f
o
r user defined mer
g
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Docu
m
ent
g
ita
t
tributes(5)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Haman
o
Update 'crlf' attribut
e
s
e
m
antics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Ju
n
io C Haman
o
Documentat
i
o
n
: suppor
t
manual s
e
ction (
5
) - file formats
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
J
unio C Hamano
S
i
m
p
lify code t
o
find rec
u
rsive me
r
ge driver
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio
C Hamano
Counto-fix i
n
merge-recursi
v
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Fix
f
unny types used i
n
attr
i
bute
value
r
epresentation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Hamano
All
o
w low
-
level driver to specify different behaviour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Ham
a
no
Custom l
o
w
-
level me
r
ge
d
river: c
h
ange the confi
g
uration
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Allo
w
the
d
efault low-level me
r
ge dri
v
er to be configu
r
ed
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Hamano
Custo
m
l
ow-le
v
el merge driver
support
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C
Hamano
Add a dem
o
nstra
t
ion
/
t
e
s
t
of custom
i
zed
merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Jun
i
o C Hamano
Allow specifying speci
a
lized merg
e
-backend per path
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ham
a
no
merge-recursive: separate out xdl_merg
e
() interface
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C H
a
mano
All
o
w
more th
a
n true/false to attrib
u
tes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Ch
a
nge attr
i
bute negation m
a
rker from '!' to '-'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Ha
m
ano
Def
i
ne a built-in a
t
tribute macro "binar
y
"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o
C
Hamano
attribute macr
o
support
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
H
amano
Makefile:
a
d
d
patch
-
ids
.
h
ba
c
k in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
H
aman
o
Fix 'di
f
f' attribute semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Fix 'crlf' attribute semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Teach 'diff' about 'diff'
a
ttribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
J
u
nio
C Ha
m
a
no
Define 'crlf
'
at
t
ribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Add
b
asic i
n
fr
a
s
tructure to assign
a
t
t
r
i
b
u
tes to pa
t
hs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C
H
amano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2007-04-14
Junio C H
a
m
ano
Do not d
e
fa
u
l
t
to --no-index when
given two director
i
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Ju
n
io C Hamano
M
e
rge branch 'j
c
/
c
h
e
rry'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-13
Junio
C Hamano
F
i
x
g
i
t
{log,show,
.
.
.
}
-
-p
r
etty=email
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
u
nio
C
Hamano
Docu
m
enta
t
ion:
-
-cherry-pick
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
uni
o
C
H
amano
gi
t
-
l
og --cherry-
p
ick A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o C Hamano
R
efa
c
t
or patch-id f
i
ltering
out of git-cherry and g
i
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C
H
amano
Add %m to '
-
-
pre
t
ty=
f
ormat:
'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Merg
e
branc
h
'main
t
'
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o C Hamano
GI
T
1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Junio C Ha
m
ano
fs
c
k: do n
o
t complain o
n
d
eta
c
hed
H
EA
D
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Ham
a
no
Merge bra
n
c
h
'
maint
'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merge
branch 'jc
/
p
u
sh'
commit
|
commitdiff
|
tree
2007-04-09
Junio C
H
amano
Merge
b
ranc
h
'
j
c
/
merge-subtree'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Mer
g
e branc
h
'js
/
fetch-progres
s
'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Add D
o
cumentation/cmd-list
.
m
ade to
.
gitignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Junio
C Hama
n
o
S
t
art 1
.
5
.
2 cycle by prepareing
RelNotes
f
or i
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Juni
o
C Hamano
Me
r
ge
branch '
j
c/read-
t
ree-df' (early part)
commit
|
commitdiff
|
tree
2007-04-08
Junio
C Hamano
M
e
rge bran
c
h
'maint'
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Pr
e
pare for
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 's
u
btree'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
Hamano
git-push
t
o
mu
l
tiple locations
d
oes n
o
t stop at
t
he
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
Hamano
git
-
p
u
sh r
e
ports the URL af
t
er failing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge branch 'j
c
/index-output'
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Hamano
Merg
e
branch
'
fp/
m
ake-j'
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
mano
Merge br
a
n
c
h
'
c
c/bisect'
commit
|
commitdiff
|
tree
2007-04-07
Junio
C Ham
a
n
o
Me
r
ge branch 'jc
/
c
heckout' (early par
t
)
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hama
n
o
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
Hamano
D
o
cument
a
tion:
t
i
g
hten dependency for git
.
{html,txt
}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
git-bise
c
t: a
l
lo
w
b
i
se
c
ting with
o
nly one bad commit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
unio C Hamano
t6030: add a bit more tests to
git-bisec
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Junio C Haman
o
g
it-bisect: modernization
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Rename add_fil
e
_to_index() to ad
d
_fil
e
_to_cache()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Rename static variable
w
r
i
te_index t
o
update_i
n
dex
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Ha
m
ano
Re
n
ame
i
nternal function "a
d
d_file_to_cac
h
e" in builtin
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C
Ha
m
an
o
Propaga
t
e ca
c
h
e
error
i
nte
r
nal to
r
efresh_
c
ach
e
() via
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Juni
o
C Hamano
Fix b
o
gus error
m
e
s
sage from
m
e
rge-r
e
cursive error
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
J
unio
C
H
a
mano
Fix dependency
o
f com
m
on-cmds
.
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Hamano
R
PM
s
pec: include git-p4
i
n
the li
s
t of all packages
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C Hamano
rerere
:
m
a
ke
sorting really s
t
a
b
l
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Hamano
Fix switching to
a
branch with D/F w
h
en curr
e
nt branc
h
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C
H
amano
Fix twoway_merge that passed d/f conflict ma
r
ker to
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
J
unio C Hamano
Fix read-t
r
e
e
--
p
refix=dir/
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C Hamano
unpa
c
k-trees: get ri
d
of *in
d
pos p
a
r
a
meter
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C H
a
m
a
no
unpack_tre
e
s
.
c
: p
a
ss unpack_t
r
ees_options str
u
cture
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
unio C Hamano
ad
d
_cache_e
n
t
ry(
)
: remo
v
al of file f
o
o do
e
s
not
c
o
n
flic
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C Hamano
Merge branch
'
jc/bisect'
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C Hamano
Merge
b
r
a
nch 'fl/d
o
c'
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
a
m
a
no
Merg
e
b
r
anch '
p
ost1
.
5
.
1
/
blame
.
el'
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C Hamano
Merge branch 'p
o
s
t1
.
5
.
1/
t
cltk'
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io
C
Hamano
Merge br
a
nch 'post
1
.
5
.
1/p
4
'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
M
erge
bra
n
ch 'lt/dirwalk'
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Ha
m
a
n
o
git-r
e
ad-tr
e
e
--
i
nde
x
-out
p
ut=<file>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Hamano
_G
I
T_IND
E
X_
O
UTP
U
T: al
l
ow
plumbing to ou
t
p
u
t
to an alter
n
ativ
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
amano
checkout
:
allow detaching to
HEAD ev
e
n when switc
h
ing
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
G
I
T 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Hamano
Merge
1
.
5
.
0
.
7 in
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
unio
C Hamano
G
IT 1
.
5
.
0
.
7
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C H
a
m
a
no
re
r
e
re should not r
e
p
e
at th
e
earlier hu
n
k
s in later
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-02
Junio C Haman
o
Hopeful
l
y final update to the draft Release Not
e
s,
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
Junio C Hamano
Optional Tck/T
k
: ignor
e
generated files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
Do no
t
bother do
c
umenti
n
g
fet
c
h
--tool
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Juni
o
C Hamano
U
p
date draft release not
e
s for 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hama
n
o
M
e
rge b
r
anch 'maint
'
commit
|
commitdiff
|
tree
2007-03-30
Junio
C
H
a
ma
n
o
Merge bra
n
ch
'master' of git://re
p
o
.
or
.
cz/git/mergetool
.
git
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
Documentation: unbr
e
ak us
e
r-manual
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Jun
i
o C
Hamano
GIT 1
.
5
.
1-
r
c
3
commit
|
commitdiff
|
tree
2007-03-28
Junio C H
a
m
a
no
Up
d
ate ma
i
n gi
t
.
html page to poi
n
t at 1
.
5
.
0
.
6 doc
u
m
e
ntatio
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
M
e
rge branch 'maint' to synchronize with 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
GIT
1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hama
n
o
Fix "--prett
y
=format:"
f
or
p
arent related items
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next