repo.or.cz
/
alt-git.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 Ham
a
no
lockfile: rec
o
rd the
primary process
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio
C Haman
o
conver
t
.
c: re
s
truc
t
ure the attribu
t
e
checking
part
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
J
unio C H
a
mano
Fix bogus li
n
ked-list managem
e
nt
for use
r
d
e
f
ine
d
me
r
g
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio
C
Hamano
Document gitattributes(5)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Ham
a
no
Update 'crl
f
' at
t
ribut
e
semant
i
c
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C
H
a
mano
D
ocumentation: support manual
s
ectio
n
(5) - file formats
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Ham
a
n
o
S
i
mplify
c
ode to find recursive me
r
ge driver
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio
C
H
a
mano
C
ount
o
-fix
in merge-recursive
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Fix
funny t
y
pe
s
used in a
t
tribute
value
r
epresenta
t
ion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Allow lo
w
-
l
evel
dri
v
er to
specify
d
ifferent behaviour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C Hamano
Custom lo
w
-level merge driver: chan
g
e
the c
o
nfiguration
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C H
a
mano
Al
l
ow the defa
u
lt low-level merge driver to be configured
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Custom low-l
e
vel merge
driver s
u
pport
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
u
nio C
H
amano
Add a demonstration/tes
t
of
c
ust
o
mized merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C H
a
mano
Allow spec
i
fying specia
l
ized merge-
b
ackend
per p
a
th
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
un
i
o C Hamano
me
r
g
e-recursiv
e
:
separ
a
te ou
t
xdl_merge() interface
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
u
nio C
H
a
mano
All
o
w more t
h
an t
r
u
e
/
fal
s
e t
o
attributes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io
C
Haman
o
Change attri
b
ut
e
nega
t
i
o
n marker from '!' to '-'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C
Hama
n
o
Define a
buil
t
-in
at
t
ribute
macro "binary"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Ha
m
ano
a
ttribute macro support
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Ham
a
no
Makefil
e
: add patch-id
s
.
h
ba
c
k i
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
H
amano
F
ix '
d
iff' a
t
tribute
semantic
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C Haman
o
Fix 'crlf'
attribute se
m
an
t
ics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C
Hama
n
o
Teach '
d
iff' about 'diff' attribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C Hama
n
o
Define 'crlf' attribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C H
a
m
a
no
Add
b
asic infrast
r
u
c
ture to ass
i
g
n
a
t
t
ribu
t
e
s
to paths
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
J
uni
o
C
H
a
mano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-14
Jun
i
o C Hamano
Do not
d
efault t
o
-
-
no-index when given two di
r
ectories
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Ju
n
io C
Hamano
Mer
g
e branch 'jc/cherry'
commit
|
commitdiff
|
tree
2007-04-13
J
u
nio C Hamano
Merge
bra
n
ch '
m
ain
t
'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Fix
git {log,sho
w
,
.
.
.
}
-
-
pretty=email
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Documen
t
a
t
ion: --cherry-pick
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Haman
o
git-log
-
-
che
r
ry-pick A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
u
nio C Hamano
R
efact
o
r
pa
t
ch-id filter
i
ng out
o
f git
-
cherry and git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Add %m to '--pretty=f
o
r
mat:'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
Hama
n
o
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
GIT 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Juni
o
C
Ham
a
no
fsck:
d
o not co
m
plain on detached HEAD
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
unio C
Ha
m
an
o
Merge b
r
a
nc
h
'
m
aint'
commit
|
commitdiff
|
tree
2007-04-09
J
u
nio
C
Hamano
Merge
b
ranch 'jc/p
u
s
h'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hama
n
o
Merge branch
'
jc/merge-subtree
'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio C
Ham
a
n
o
Merge bra
n
c
h '
j
s
/
fetch-progress'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merg
e
branch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-09
J
u
nio C Hama
n
o
Add
D
ocumentati
o
n
/
cmd-list
.
m
ade
to
.
g
i
tignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Start 1
.
5
.
2
c
ycle by prepareing
RelNot
e
s for
it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
J
u
nio
C Hamano
M
erge bra
n
ch 'jc/read-tree-df' (ea
r
ly par
t
)
commit
|
commitdiff
|
tree
2007-04-08
Junio
C Hamano
Me
r
ge branch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-08
Junio C
Hamano
Prepare for
1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ham
a
n
o
A new merge stragety 's
u
btree'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
unio C Hamano
g
it-push t
o
m
u
ltiple locations does not stop at
t
he
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ham
a
n
o
gi
t
-push reports the URL aft
e
r faili
n
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o C Hamano
Merge
b
ranch 'jc/index-ou
t
put
'
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
man
o
Merge branch 'fp/mak
e
-
j
'
commit
|
commitdiff
|
tree
2007-04-07
Junio C
H
a
mano
Me
r
ge br
a
nch 'cc/b
i
sect'
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
mano
M
erge br
a
n
c
h 'jc/che
c
kout' (ea
r
ly
p
a
r
t
)
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hama
n
o
D
o
c
umentation:
tig
h
ten de
p
en
d
e
n
c
y for git
.
{h
t
ml,txt}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
unio C
H
amano
git-bi
s
ect: allow bis
e
c
t
i
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 Hamano
t603
0
: add a
bit more te
s
ts to g
i
t-b
i
sect
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
J
u
n
i
o
C Hamano
git-bisect:
m
odernization
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C Hamano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2007-04-05
J
u
nio
C
Hamano
Rename add_f
i
le_to_in
d
ex() to add_f
i
le_to_ca
c
he()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Rename
s
t
atic variable wr
i
te_index
t
o
update_index
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Jun
i
o
C H
a
ma
n
o
Renam
e
internal function "add_
f
i
l
e_t
o
_ca
c
he" in builtin
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C Hamano
P
ropagate cache e
r
r
o
r int
e
r
n
al to re
f
resh
_
ca
c
he()
via
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
J
unio C Hamano
F
i
x bogus error message from merg
e
-
r
e
cursive
e
r
r
or
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C
Hamano
Fix dep
e
ndency of com
m
on-cmds
.
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Haman
o
R
P
M
s
pec:
i
n
clude git
-
p4 in the list
o
f all packa
g
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ham
a
no
rerere: make
sortin
g
really stable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o
C Ha
m
a
no
Fi
x
switching to
a
branc
h
with
D
/F
when curr
e
n
t
branc
h
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Hamano
Fix twow
a
y_merge that passed d/f conflict ma
r
ker to
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
J
unio C Hamano
Fix
r
ead-t
r
ee --p
r
efix=
d
ir/
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Ha
m
ano
unpack
-
tree
s
:
g
et
r
i
d
of *indpos parameter
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
unpack_trees
.
c
: pass u
n
pack_trees_opt
i
ons
s
truct
u
re
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C
H
amano
add_cache
_
e
ntry
(
)
:
r
emoval of f
i
le foo does
n
o
t
con
f
lict
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hama
n
o
Merge branch '
j
c/bisec
t
'
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C
H
a
mano
Merge bra
n
ch 'fl/doc'
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io
C
Ha
m
ano
Merge branch 'p
o
st1
.
5
.
1
/
blame
.
el'
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C Hamano
Merge branch 'post1
.
5
.
1/tcl
t
k'
commit
|
commitdiff
|
tree
2007-04-04
J
u
ni
o
C Hamano
Merge branch 'po
s
t1
.
5
.
1/
p
4'
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
amano
Merge branc
h
'
l
t/d
i
rwalk
'
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Haman
o
git-read-tree --index-output=<f
i
le>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
n
i
o
C Hamano
_GIT_INDEX_OUTPUT:
a
llo
w
plumbing
t
o outp
u
t
to an
alternativ
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
unio C Hamano
checkou
t
: allow de
t
aching
to HEAD
e
ven w
h
en switching
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o
C H
a
mano
GIT
1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Hamano
M
e
rge 1
.
5
.
0
.
7 in
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Hamano
G
I
T 1
.
5
.
0
.
7
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
rerere should not repeat
the
earlier h
u
nks in later
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-02
J
u
ni
o
C Hamano
H
opefu
l
ly
f
i
nal update to the draft Release No
t
es,
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
J
u
n
io C Ha
m
ano
Optional Tck
/
Tk: igno
r
e
generated files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Ju
n
io C Hamano
Do n
o
t bother document
i
ng fetch
-
-tool
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Jun
i
o C
H
amano
Update draft release no
t
es for 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio
C
Hamano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2007-03-30
Ju
n
i
o
C Hamano
Merge branc
h
'mas
t
er' of git://re
p
o
.
or
.
cz/git/mergetool
.
g
i
t
commit
|
commitdiff
|
tree
2007-03-28
J
unio
C
Hamano
Docume
n
tation: un
b
r
eak user-manual
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
J
u
nio C
Hamano
GI
T
1
.
5
.
1-rc
3
commit
|
commitdiff
|
tree
2007-03-28
J
unio
C
Hamano
Upda
t
e main git
.
html page to point at 1
.
5
.
0
.
6
documentation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Juni
o
C Hamano
Merge bra
n
c
h '
m
aint' to synchronize with
1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Juni
o
C Hamano
GIT
1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C Ham
a
no
Fix "
-
-prett
y
=format:" for parent related item
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next