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
Simplify code to find recursive merge driver.
2007-04-19
Junio C Ham
a
no
Simplify code to f
i
nd recursive merge driver
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Ha
m
ano
Counto-fi
x
in m
e
rge-rec
u
r
sive
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
i
o C Ha
m
ano
Fi
x
funny t
y
pes used in
a
ttribute value
r
epres
e
ntation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ham
a
no
Allow
l
o
w-l
e
v
e
l
driver
t
o specify different behaviour
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
unio
C
Hama
n
o
Custom l
o
w-level merge driver
:
chan
g
e the configuration
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Hamano
All
o
w t
h
e default
l
ow-level m
e
r
ge driver
t
o be co
n
fi
g
ured
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C Hama
n
o
Cus
t
om low-level
m
erge dr
i
ver suppo
r
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C
H
a
mano
Ad
d
a
dem
o
n
s
tration/test of
customized merge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
J
u
nio
C
Ha
m
ano
Allow specifying
specialized merge-b
a
ckend
p
e
r
path
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
J
unio C
H
amano
me
r
ge-recu
r
sive: separate out xdl_merge() interface
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Haman
o
Allow more t
h
an true/f
a
lse
to attributes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Change attribut
e
negati
o
n mark
e
r
f
r
o
m '!' to '-'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io C
H
a
mano
D
e
fine a built-in at
t
ribute mac
r
o "binary"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Juni
o
C Hamano
attribute macr
o
support
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Ma
k
efile: add patch-id
s
.
h
b
ack in
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Fix
'diff
'
attri
b
ute semanti
c
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
F
i
x 'crlf' att
r
ibu
t
e semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Teach 'dif
f
'
a
bout 'd
i
ff' att
r
i
bute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
D
e
fine 'c
r
l
f
'
a
ttribute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio
C
H
a
mano
Ad
d
basi
c
infrastructu
r
e to a
s
sign
att
r
i
butes to paths
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
J
u
nio C Haman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Do not default to
--no
-
index when
given t
w
o directories
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Merge
branch
'jc/ch
e
rry'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Ha
m
a
n
o
Fi
x
git {l
o
g,sho
w
,
.
.
.
} --
p
r
e
t
ty=email
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
u
n
io
C H
a
m
ano
Documentatio
n
: --cherry-pick
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
Haman
o
git-log
--cher
r
y-
p
i
c
k A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o
C
H
a
mano
Refactor patch-
i
d fil
t
ering
o
ut of git-ch
e
rry and gi
t
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Add %m to '--pretty=format
:
'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
u
nio C Hamano
M
e
rge
b
r
a
n
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
io C Hamano
GIT 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-11
J
u
ni
o
C
Hamano
fsck: do
not complain on detac
h
ed HEA
D
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
J
u
nio C Ham
a
n
o
Merge br
a
n
c
h 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-09
Ju
n
io C Ha
m
ano
Merge
branch 'jc/
p
ush'
commit
|
commitdiff
|
tree
2007-04-09
Junio
C
Ha
m
ano
Merge branch 'jc/m
e
rg
e
-
s
ubtree'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
J
u
n
i
o
C Hamano
Merge bra
n
ch
'js/fetch
-
p
rogress'
commit
|
commitdiff
|
tree
2007-04-09
Junio
C
H
amano
M
erge
branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-09
Junio
C Haman
o
Add Docume
n
tation/cmd-li
s
t
.
made to
.
gitignore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Start 1
.
5
.
2 c
y
cle by preparein
g
RelN
o
t
e
s for it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Ju
n
io
C Hama
n
o
M
erge b
r
anch 'jc/
r
ead-tree-
d
f' (early p
a
rt
)
commit
|
commitdiff
|
tree
2007-04-08
J
uni
o
C
H
amano
Merge
b
ranc
h
'maint
'
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
H
amano
A
new merge stragety 'subtree'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
g
it-push to multiple locations
does not stop
a
t
the
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio
C
H
amano
git-push r
e
por
t
s the UR
L
a
f
ter fai
l
i
n
g
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Ham
a
n
o
Merge branch 'j
c
/index-out
p
ut'
commit
|
commitdiff
|
tree
2007-04-07
J
u
n
io
C Haman
o
M
e
rge b
r
anch 'fp/m
a
k
e-j'
commit
|
commitdiff
|
tree
2007-04-07
J
un
i
o C Hamano
Merge
branch 'cc/bisect'
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
m
ano
Merge bran
c
h 'jc
/
c
heckou
t
' (early part)
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio
C
Ham
a
no
D
o
cumentatio
n
:
t
ighte
n
d
e
pendency for git
.
{html,txt}
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
gi
t
-
b
isect: al
l
ow
b
isecti
n
g with only one bad commit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
unio
C
H
a
m
ano
t
6
0
30: add a
b
it more tests to git-bisect
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Junio C Hamano
git
-
bi
s
ect: mode
r
niza
t
i
on
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Jun
i
o
C Hama
n
o
M
erge
branch
'
m
aint'
commit
|
commitdiff
|
tree
2007-04-05
Junio C Ham
a
no
Re
n
ame add_
f
i
l
e_to_in
d
ex() to add_file_to_cac
h
e()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Rename static v
a
riable write
_
index to update_
i
ndex
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Jun
i
o C Hamano
Ren
a
me internal function "add_file_to_cache" in built
i
n
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Jun
i
o C Hamano
Prop
a
gate
cache e
r
ror in
t
ernal to refresh_c
a
che() via
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Haman
o
Fix b
o
gus error message from merge-r
e
c
u
rsive error
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
J
u
nio C Hamano
Fix
de
p
endency of common-c
m
d
s
.
h
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C Hamano
RPM spec: include git-p4 i
n
the list of al
l
packages
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
rerere: m
a
ke sorting really st
a
ble
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
unio C H
a
man
o
F
ix sw
i
t
c
hing to a branc
h
w
i
th D/F
w
hen current
bra
n
ch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hama
n
o
Fix
twoway_merge th
a
t pas
s
ed
d/f
con
f
lict m
a
rker
t
o
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Fix read-t
r
ee
-
-prefix=d
i
r/
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C
H
ama
n
o
unpac
k
-t
r
ees:
get rid of *in
d
pos parameter
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
u
n
io C
H
aman
o
unpac
k
_tre
e
s
.
c: pass
unpack_trees_op
t
ions st
r
uctur
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
am
a
n
o
add_cache_entry(): re
m
oval of
f
il
e
f
oo
does n
o
t confl
i
ct
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ham
a
no
M
e
rge bra
n
ch 'jc
/
bisect'
commit
|
commitdiff
|
tree
2007-04-04
J
unio C Hamano
Me
r
g
e
b
ranch 'fl/d
o
c
'
commit
|
commitdiff
|
tree
2007-04-04
Junio C H
a
mano
Merge branch 'p
o
st1
.
5
.
1/blame
.
el'
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Hamano
Merge branch 'post1
.
5
.
1/tcltk'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge branch 'post
1
.
5
.
1/
p
4'
commit
|
commitdiff
|
tree
2007-04-04
Junio C H
a
mano
Me
r
ge
bra
n
c
h 'lt/d
i
rwalk'
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
a
mano
git-read-tree --index-output=<file>
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C
Hama
n
o
_G
I
T_INDEX_OUTPUT: a
l
low plumbin
g
to output
t
o an
al
t
ern
a
tiv
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C Hamano
checkout: allow det
a
ching
to H
E
AD even when
s
w
itching
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C
H
amano
GIT 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
Junio C Hamano
GI
T
1
.
5
.
0
.
7
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hama
n
o
re
r
ere should
no
t
rep
e
at
t
he ea
r
lier hunks in later
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-02
Jun
i
o C Ham
a
no
Hopefully
fin
a
l update to the draft Release Note
s
,
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-01
Junio C Ham
a
no
Opti
o
nal Tck/T
k
:
i
gn
o
re ge
n
erat
e
d
f
i
les
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
J
u
nio C H
a
m
ano
Do
not both
e
r documenting fetch--tool
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hama
n
o
Updat
e
d
r
af
t
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
Mer
g
e branch '
m
aint'
commit
|
commitdiff
|
tree
2007-03-30
J
u
nio
C Hamano
Merge bra
n
c
h
'master'
of git://repo
.
o
r
.
cz/git/merget
o
ol
.
git
commit
|
commitdiff
|
tree
2007-03-28
Junio C Ha
m
ano
Documentati
o
n: u
n
break user-manual
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Jun
i
o C Ham
a
no
GIT 1
.
5
.
1-rc3
commit
|
commitdiff
|
tree
2007-03-28
Junio C Ham
a
no
U
pdate m
a
in
g
it
.
html page to point at
1
.
5
.
0
.
6 docu
m
entation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Junio C
H
amano
Me
r
g
e branch 'maint'
t
o s
y
n
chronize with
1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C
Hamano
GI
T
1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Jun
i
o
C Ha
m
ano
Fix "-
-
pretty=for
m
at:" for parent related items
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
gi
t
-comm
i
t: "
r
ead-tree -m HEAD" is
not the right way
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
J
u
nio C Haman
o
sha1_f
i
le
.
c
(write_sha1_file): Detect close
failure
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Junio C Hamano
Document git-log
--
f
irst
-
parent
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-26
Ju
n
io C Hamano
GIT 1
.
5
.
1-rc2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-26
J
uni
o
C Hamano
Merge br
a
nch 'jc/fpl
'
commit
|
commitdiff
|
tree
2007-03-26
Junio C H
a
m
ano
Updat
e
README to
point at a fe
w
ke
y
p
eriodica
l
me
s
sages
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next
