repo.or.cz
/
git
/
raj.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Simplify code to find recursive merge driver.
2007-04-19
Juni
o
C Ha
m
ano
Simplify cod
e
to find recursiv
e
merge dri
v
er
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
J
un
i
o C Hamano
Counto-
f
i
x in me
r
ge-recursive
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Haman
o
Fi
x
funny types used in at
t
r
ibut
e
value represen
t
ation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
uni
o
C Ha
m
ano
Allow
l
ow-level d
r
iver to spec
i
fy different be
h
aviour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Custom low-level merge
d
r
iver: c
h
ange th
e
confi
g
uration
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C Hamano
Allow the default low-level merge driver to be config
u
red
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Custom low-level m
e
rge dri
v
er
suppor
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ham
a
no
Ad
d
a d
e
m
o
nstratio
n
/test of customi
z
ed mer
g
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
unio C Hamano
Allow specifying specializ
e
d
merge-back
e
nd
per
p
ath
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
merg
e
-recu
r
sive: separate
o
ut x
d
l_merge() int
e
rface
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C
Ha
m
ano
Allow more than tr
u
e/false
to a
t
tributes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Ha
m
ano
Change att
r
ibute negation marker from
'
!' to
'
-'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
u
ni
o
C Hamano
Define a built-in attribut
e
macro "bin
a
ry"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
attr
i
bute macr
o
su
p
port
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
i
o C Hamano
Makef
i
le: add patch-ids
.
h
b
a
c
k in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o C H
a
mano
Fix 'diff' at
t
r
i
bute sema
n
tics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Juni
o
C Hama
n
o
Fix
'
cr
l
f'
a
ttribute semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Teach 'diff' about 'diff' attribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C H
a
mano
Def
i
ne 'c
r
lf' att
r
i
b
u
te
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Jun
i
o C Hamano
Add ba
s
ic i
n
frastru
c
ture to assign at
t
ributes t
o
pa
t
hs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
J
unio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-14
J
u
n
io C Hamano
Do not default to -
-
no-index wh
e
n giv
e
n
two dir
e
ctories
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Me
r
ge branch
'
jc/cherry'
commit
|
commitdiff
|
tree
2007-04-13
Juni
o
C H
a
man
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Fix git {
l
og,show,
.
.
.
} -
-
pretty=email
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
u
ni
o
C Hamano
Docu
m
entation
:
-
-
cherry-pick
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
g
i
t-log
-
-cherry-pick A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
u
nio C
H
ama
n
o
Refact
o
r
patch-id filtering out
o
f git-cher
r
y and git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Add %m to '--pret
t
y
=format:'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
Hamano
Mer
g
e branch '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
Junio C
H
amano
f
s
ck:
do
not complain on detached HEAD
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C
Hamano
Merge
branch
'
maint'
commit
|
commitdiff
|
tree
2007-04-09
J
un
i
o C Hamano
Me
r
ge b
r
anc
h
'jc/push'
commit
|
commitdiff
|
tree
2007-04-09
Jun
i
o C Haman
o
Me
r
ge
b
r
anch
'j
c
/merge-subtr
e
e'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
M
e
rge b
r
anch 'js/fetch-progress'
commit
|
commitdiff
|
tree
2007-04-09
Jun
i
o C Hamano
Merge bra
n
ch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-09
Ju
n
i
o C Hamano
Ad
d
Doc
u
m
e
nt
a
tion/cm
d
-
l
ist
.
m
ade to
.
gitignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Juni
o
C Hamano
Start 1
.
5
.
2 cycle
by
prepare
i
ng Rel
N
ot
e
s
for it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Ham
a
no
Mer
g
e branch 'jc/rea
d
-tre
e
-df'
(
early part)
commit
|
commitdiff
|
tree
2007-04-08
Junio C
H
amano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-08
Juni
o
C
H
amano
Prepa
r
e for 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Hama
n
o
A new merge stragety 'subtree'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C Hamano
git-
p
ush t
o
m
u
ltiple locations does
not
s
to
p
at the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
u
ni
o
C H
a
mano
git-push reports the URL after failing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Me
r
g
e b
r
anch
'
jc/index-outp
u
t
'
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Hamano
Me
r
ge branch 'fp/make-j'
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io
C
Haman
o
Merg
e
b
r
anch 'c
c
/bise
c
t
'
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
H
a
mano
Merge bran
c
h 'jc/checkou
t
' (early part)
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C H
a
ma
n
o
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ha
m
ano
Documentati
o
n
:
t
ighten d
e
pen
d
e
n
cy for git
.
{html,txt}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
H
amano
git-bisect:
a
llow bis
e
cting with only one bad
commit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
Ha
m
a
n
o
t6030: add a
b
it more tes
t
s to git-bisect
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Jun
i
o C Hamano
git-bisect: m
o
dernization
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C
Hamano
M
e
rge br
a
nch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-05
Ju
n
io C Hamano
R
e
na
m
e add_fi
l
e
_to_in
d
ex() to add_file_to_
c
ache()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
R
enam
e
s
t
atic variabl
e
write_index to upda
t
e_index
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
J
unio
C
Hamano
Re
n
ame in
t
e
rnal functi
o
n "ad
d
_file_to_cache"
i
n
bu
i
ltin
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C
Hamano
P
ropagate
c
ache er
r
or inter
n
al to refre
s
h_cache() via
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Jun
i
o
C Hamano
Fix bogus e
r
r
o
r
messa
g
e
f
rom merge-
r
ecurs
i
ve error
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
J
u
nio C Hamano
Fix depende
n
c
y of c
o
mmon-cmds
.
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
unio C
Hamano
RPM spec: include git-p4 in the
l
ist of all pa
c
kages
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o
C Ha
m
ano
rere
r
e: make sorting real
l
y stable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
unio C Hamano
Fix switching to
a
b
r
anch with D/F when
current bra
n
ch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
unio C
Hamano
Fix twoway
_
m
e
rge th
a
t passed d/f conflict marker to
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C Haman
o
Fix r
e
ad-tr
e
e --prefix=dir/
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ha
m
ano
unpack-trees:
get ri
d
of
*indpos para
m
eter
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Hamano
unpack_tree
s
.
c: pass
unp
a
ck
_
trees_option
s
structure
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
a
d
d_cache_
e
n
t
ry():
removal of file foo does not
conflict
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
H
am
a
n
o
Merge br
a
nch 'j
c
/
b
isect'
commit
|
commitdiff
|
tree
2007-04-04
J
unio
C
Ham
a
no
Merg
e
branch 'fl/doc'
commit
|
commitdiff
|
tree
2007-04-04
J
uni
o
C Haman
o
Merge branch
'post1
.
5
.
1/blame
.
e
l
'
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io
C Haman
o
Merge branch 'p
o
st1
.
5
.
1/tcltk'
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
H
a
mano
Merge
br
a
nch
'po
s
t1
.
5
.
1/p4'
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Haman
o
M
erge branch '
l
t/dirwal
k
'
commit
|
commitdiff
|
tree
2007-04-04
J
unio
C
Hamano
git-r
e
a
d-
t
ree --index-output=<file
>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C
H
a
m
ano
_GIT_INDEX_OUTPUT: allow
p
lumbing to
output to
a
n
altern
a
tiv
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Hamano
checkout: al
l
ow
detaching
to
HEAD even wh
e
n sw
i
tchi
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
ni
o
C Hamano
GIT 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o
C
H
a
man
o
Merg
e
1
.
5
.
0
.
7 in
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio 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 Ham
a
no
rerer
e
should not re
p
e
at
the earlier hun
k
s in l
a
t
e
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-02
Junio C Hamano
H
o
p
e
fully final
update to the draft Rel
e
ase Note
s
,
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
Junio C Hamano
O
p
tiona
l
Tck/Tk: igno
r
e g
e
n
e
rated fil
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio
C Hama
n
o
Do not bother do
c
umenting fetch--too
l
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
Update draft release n
o
tes
f
or 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C
Ha
m
ano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
Me
r
ge
b
ranch 'maste
r
' o
f
g
i
t://repo
.
o
r
.
c
z/git/merg
e
tool
.
git
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
Documen
t
ation: un
b
reak user-man
u
al
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C
H
aman
o
GIT
1
.
5
.
1-
r
c
3
commit
|
commitdiff
|
tree
2007-03-28
J
unio
C
Hamano
Update main git
.
htm
l
page to point at 1
.
5
.
0
.
6 doc
u
mentation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
Merge bran
c
h 'm
a
int'
t
o
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 Hamano
Fix "--pret
t
y=
f
o
rmat:" for par
e
nt rela
t
ed items
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Ha
m
ano
git-
c
om
m
it: "read
-
tree -m HEAD" is not the right way
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Juni
o
C Hamano
sha1_
f
i
l
e
.
c (write_sha1_file): Dete
c
t close failure
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Junio C Hamano
Document git-
l
og
-
-first-par
e
nt
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Junio C Ha
m
an
o
G
IT 1
.
5
.
1-rc2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Junio
C Hamano
M
erge branch 'jc/fpl'
commit
|
commitdiff
|
tree
2007-03-26
Junio
C Ham
a
no
Update README to poi
n
t at a few key
periodic
a
l message
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next