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
J
unio C Ha
m
ano
lockfile:
r
e
cord
t
he primary process
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C
H
a
mano
co
n
ve
r
t
.
c: restructure t
h
e attribute check
i
n
g
part
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Ju
n
i
o C H
a
mano
Fix
bogus link
e
d-list mana
g
ement for user defined
m
erge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Jun
i
o C
H
amano
Document
g
i
t
at
t
ribu
t
es(5)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Upda
t
e
'crl
f
' attribute
s
emantic
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Ju
n
io C
Haman
o
Doc
u
mentation: support ma
n
ua
l
section (5) - file formats
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Ju
n
io C Hamano
Simpli
f
y code to fi
n
d recursive
mer
g
e driver
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Ju
n
io C
H
amano
Cou
n
to-fix in merge-recursive
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Fix f
u
nny types used in attribute value represent
a
tion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io
C Ha
m
ano
Allow lo
w
-
level driver to specify differ
e
nt beha
v
i
o
ur
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Ham
a
no
Cus
t
om
low-
l
evel
merge
drive
r
: change the con
f
igur
a
tion
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hama
n
o
Allow t
h
e default
l
o
w
-
level merge driver t
o
be conf
i
gure
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Hamano
Custom
low-level
m
er
g
e drive
r
supp
o
rt
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ha
m
ano
Add a demonstration/te
s
t
o
f
customi
z
e
d
merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io C H
a
mano
A
llow specifyi
n
g s
p
ecialized
merge-backend per path
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
i
o C Hamano
merg
e
-recur
s
ive: s
e
par
a
te out xdl_merge() interface
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
unio
C
Hama
n
o
A
llow more than tru
e
/false to
a
t
tributes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
unio C
Hamano
Change attribute neg
a
tion marke
r
fr
o
m '!
'
t
o
'-
'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
Ham
a
no
D
efine a built
-
i
n attribute macro "
b
in
a
r
y
"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o C
H
amano
attribute macro suppo
r
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
u
ni
o
C Haman
o
M
a
k
e
f
ile:
add p
a
tc
h
-ids
.
h back in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Fi
x
'diff' at
t
ribute semant
i
cs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
unio
C Ha
m
ano
Fix 'crlf'
attrib
u
te
s
emantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio
C
Ha
m
a
no
Te
a
c
h 'diff' abo
u
t 'dif
f
' attrib
u
t
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Define '
c
rlf
'
attr
i
bute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Add basic in
f
rastructure
t
o assign attributes to pa
t
hs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C
Hamano
Me
r
ge branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-14
Junio
C H
a
m
an
o
Do not
de
f
ault to --no
-
index when given
two directori
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Junio C H
a
mano
Merge branch 'jc/cherry'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hama
n
o
Merge
b
r
anch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hama
n
o
Fix git {log,show,
.
.
.
}
--pretty=emai
l
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Docu
m
entation
:
--cherry-pic
k
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o C Hamano
git-log -
-
cherr
y
-pic
k
A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Refactor
patch-id filteri
n
g out of git
-
cherry and git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Haman
o
Add %
m
to
'
--pretty=format:'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o C Hamano
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 de
t
ache
d
HEAD
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C H
a
m
a
no
Merge bra
n
ch
'main
t
'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merge branch
'
jc/pu
s
h'
commit
|
commitdiff
|
tree
2007-04-09
J
u
nio C Ha
m
a
no
Merge branch 'jc/merge
-
s
ubtr
e
e'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merg
e
b
r
anch '
j
s
/
fetch-
p
r
o
gr
e
ss'
commit
|
commitdiff
|
tree
2007-04-09
J
u
nio
C Hamano
M
e
rge bran
c
h
'
mai
n
t'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Add Do
c
umentation/cmd-list
.
made to
.
gitignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
J
u
n
i
o C Ha
m
ano
Start 1
.
5
.
2 cycle by pre
p
areing
R
elNotes for
it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Junio
C
Hamano
Mer
g
e branch 'j
c
/read-tree-
d
f
'
(
early part)
commit
|
commitdiff
|
tree
2007-04-08
Jun
i
o
C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-08
Junio C Ha
m
ano
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 me
r
g
e
stragety '
s
u
b
t
r
ee'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio C H
a
m
ano
git-push to multiple locations does not stop at the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
Hamano
git-push reports th
e
URL
aft
e
r failing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
H
amano
Merg
e
branch '
j
c/inde
x
-output'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge branch 'fp/make-j'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hama
n
o
Merge
b
ranch 'cc/bisect'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge branch 'jc/c
h
eckout' (early part)
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
Hamano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C Hamano
Docu
m
entation
:
t
i
ghten
de
p
endency for git
.
{h
t
ml
,
t
x
t}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o C Hamano
git-bis
e
ct: allow bisectin
g
with only one bad commit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
m
a
no
t6030: add a bit more t
e
sts
t
o git-bisect
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Junio C Hamano
git-bi
s
ect: modernizatio
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
J
u
nio
C
Hamano
Mer
g
e branch 'maint
'
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Rename add_f
i
le_to_index
(
) to add_file_t
o
_cache()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C
H
a
m
ano
Rename static
variabl
e
w
r
i
te_i
n
dex to update_i
n
dex
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C H
a
mano
Rena
m
e internal funct
i
on "add_file_to
_
cache"
in builtin
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Ha
m
ano
Pro
p
aga
t
e cache e
r
ror
in
t
ern
a
l to refresh_cach
e
(
) vi
a
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Ju
n
io C Hamano
F
i
x bogus
error message from m
e
rge-r
e
cur
s
ive error
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C H
a
mano
Fix de
p
e
n
d
e
ncy
of
c
om
m
on-cmds
.
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
RPM spec: inclu
d
e git-p4 in the list of all pa
c
k
a
g
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
rerere: make s
o
r
t
ing really stabl
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ha
m
ano
Fix
s
wi
t
ching to a
branch with D/F when c
u
rrent branch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Fix twoway_mer
g
e
that passed
d
/f con
f
lict marker to
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
Junio
C Hamano
Fix r
e
ad-tr
e
e --pre
f
ix=dir/
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C
H
ama
n
o
unpac
k
-tre
e
s: get r
i
d of *i
n
dpos par
a
meter
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
n
io C Ham
a
n
o
unp
a
ck_trees
.
c: pass
u
n
pa
c
k
_tre
e
s_optio
n
s
structu
r
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Hama
n
o
add_cache_entry(): removal of file foo does not c
o
nflict
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge bran
c
h
'
jc
/
bi
s
ect'
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
am
a
n
o
Merge bran
c
h 'fl/doc'
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
i
o C Hamano
Merge branch 'post1
.
5
.
1/b
l
ame
.
el
'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Haman
o
Merge branch 'post1
.
5
.
1/
t
c
ltk'
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C Haman
o
Merge
b
ranch 'post1
.
5
.
1/p4'
commit
|
commitdiff
|
tree
2007-04-04
J
uni
o
C Hamano
Merge b
r
an
c
h 'lt/dirwalk'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
g
it-read-tree
-
-index
-
output=<file>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
_G
I
T_IN
D
EX_OUTPUT: allow plumbing to
o
utput to an
a
ltern
a
tiv
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Haman
o
checkout: allow
d
etaching t
o
HEAD
even when swi
t
chin
g
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ha
m
ano
G
IT 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Hamano
Me
r
ge 1
.
5
.
0
.
7 in
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ha
m
ano
GIT 1
.
5
.
0
.
7
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
ni
o
C Hamano
re
r
ere
shou
l
d
not repeat
the earlier hu
n
ks in later
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-02
J
u
nio C Hamano
Hope
f
ully final upd
a
te to the draft
Release Notes,
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
Junio C Ha
m
ano
Optional Tck/Tk: ignore
g
e
nera
t
e
d fi
l
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
Do
n
ot
b
other documenting fetch-
-
too
l
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
Upda
t
e
draf
t
rel
e
ase note
s
fo
r
1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C
Hamano
Merge
branch
'maint
'
commit
|
commitdiff
|
tree
2007-03-30
J
u
n
io C Ham
a
no
Merge
branch '
m
as
t
er' of git
:
//
r
e
po
.
or
.
cz/git/mer
g
et
o
ol
.
g
it
commit
|
commitdiff
|
tree
2007-03-28
Junio C
H
a
mano
Documentation:
u
n
b
reak user-manua
l
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio
C
Hamano
G
I
T 1
.
5
.
1-
r
c3
commit
|
commitdiff
|
tree
2007-03-28
Ju
n
io C Ha
m
ano
Update 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
Junio
C
Hamano
Me
r
ge bran
c
h 'maint' to
synchronize w
i
th 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
J
u
nio C H
a
mano
GI
T
1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C H
a
man
o
Fix "--pretty=for
m
at:
"
for p
a
rent related item
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next