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
Ju
n
io C Hamano
S
implify co
d
e
t
o fi
n
d recursive
merge driver
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
J
u
nio C Hamano
Counto-fix i
n
mer
g
e-r
e
cur
s
ive
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Fix funny types
u
s
ed in attribut
e
value
r
eprese
n
t
a
tion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ha
m
an
o
Allow l
o
w-l
e
vel
d
river to spec
i
f
y di
f
f
e
rent
b
ehaviour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C H
a
mano
Cust
o
m low-level merge drive
r
:
cha
n
ge the co
n
figuration
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Ham
a
no
Allow
t
he defa
u
lt low-lev
e
l me
r
ge dri
v
er to
be configured
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ha
m
a
n
o
Custom low-
l
ev
e
l merge
d
rive
r
s
u
pport
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C Ha
m
ano
Add
a demonstration/test of c
u
sto
m
i
zed
m
erge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C
H
a
m
a
no
Al
l
ow specifying s
p
ecialize
d
merge-backend per path
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C
Haman
o
m
e
r
ge-recursive: sep
a
r
a
te out xdl_me
r
ge
(
) inte
r
face
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C
H
amano
Allow more than
true/false to attri
b
utes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Haman
o
Cha
n
ge attribute negation marker fro
m
'!' to
'-'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Define a bu
i
l
t-in attri
b
ute
m
a
cro "binary"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio C Hama
n
o
attribute macro support
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Juni
o
C Ha
m
ano
Makefile: ad
d
pa
t
ch-ids
.
h back in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Juni
o
C Hamano
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' at
t
ribute sema
n
t
i
cs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio
C Ha
m
ano
Tea
c
h '
d
iff' about
'diff' attribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio
C
Ha
m
ano
Define 'crlf' attribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Add basic infrastructure t
o
assi
g
n attributes to paths
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
io C Ha
m
a
n
o
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2007-04-14
J
u
nio C H
a
ma
n
o
Do n
o
t default to -
-
no-index when give
n
two directories
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Junio
C
H
amano
Mer
g
e
b
r
anch 'jc/cherr
y
'
commit
|
commitdiff
|
tree
2007-04-13
J
unio C Hamano
Merge
b
ranch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hama
n
o
Fix git
{
l
og,show,
.
.
.
}
--pretty
=
e
mail
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C
H
amano
Documentation:
-
-cherry-pick
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
unio C Ha
m
ano
git-
l
o
g
--ch
e
rry-pick A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Ham
a
no
Refacto
r
patch-id filterin
g
o
ut of git-ch
e
r
ry and git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Ad
d
%m to
'--pretty=format:'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C Hamano
M
e
rge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-12
Juni
o
C Ha
m
ano
GIT 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
J
uni
o
C Hamano
fs
c
k: do not
c
o
mplai
n
on detached
H
E
AD
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Juni
o
C
Haman
o
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
Jun
i
o C Ham
a
no
M
erge b
r
anch 'jc
/
push
'
commit
|
commitdiff
|
tree
2007-04-09
Juni
o
C Hamano
Merge branch 'jc/merg
e
-
s
ubtree'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Ju
n
io C Hamano
M
e
rge branch 'j
s
/fe
t
ch-
p
rogr
e
ss'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Ham
a
no
M
e
rge
b
ranch 'maint
'
commit
|
commitdiff
|
tree
2007-04-09
Junio C
Hamano
A
d
d
Docum
e
nt
a
tion/c
m
d-
l
ist
.
made to
.
gitignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Ju
n
io C H
a
mano
Start 1
.
5
.
2 cycle by pre
p
are
i
ng
R
e
lNotes for it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Junio C
H
a
m
ano
Merg
e
b
r
anch '
j
c
/r
e
ad-tree-d
f
' (ear
l
y par
t
)
commit
|
commitdiff
|
tree
2007-04-08
Junio C H
a
mano
Merge
bra
n
c
h
'maint'
commit
|
commitdiff
|
tree
2007-04-08
J
un
i
o C Hamano
Pre
p
ar
e
fo
r
1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
un
i
o C Hamano
A new merge strage
t
y 'subt
r
ee'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C Ha
m
ano
git-push to
m
ultiple locatio
n
s does not s
t
op a
t
th
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hama
n
o
git-
p
ush reports the URL af
t
er failing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
H
amano
Merge
b
ranch 'jc/index-output'
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
Hamano
Merge branc
h
'fp/
m
ake-j'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Haman
o
Merge branch 'cc/bisect'
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o C Hamano
Merge
b
ra
n
ch 'jc/checkout' (e
a
rly part)
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-07
J
unio
C Haman
o
Docume
n
tation
:
tighten d
e
pendency for git
.
{h
t
ml,txt}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
mano
git-bisect: allow bisecting wit
h
only o
n
e b
a
d 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
t
s
to
g
it-b
i
sect
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Junio C Hamano
git-bisect: modernization
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Ju
n
i
o C Hamano
Mer
g
e branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-05
J
u
nio C Hamano
R
ename add_file_
t
o_index() to add_file_to_cache()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Jun
i
o
C Ham
a
no
R
e
nam
e
static v
a
riable write_index to update_in
d
ex
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C H
a
m
ano
R
e
na
m
e internal function "add_file_to_cache"
in builtin
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Propagate
cache error internal t
o
refresh_cache() via
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Fix bogus error
m
essage from merge-recursive er
r
or
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Fix depen
d
ency of
c
ommon-cmds
.
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
RPM spec: include
git-p4 in the list of all packages
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Haman
o
rerere: ma
k
e sorting r
e
ally stable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ham
a
no
Fix swi
t
c
hing to a bran
c
h with D/F when
c
urrent bra
n
ch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C Hamano
F
ix t
w
oway_
m
erge
t
hat passed d/f conflict marker to
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
J
unio C Hama
n
o
Fix
read-
t
ree -
-
prefix=dir/
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Haman
o
unpac
k
-t
r
ee
s
: get r
i
d of *indpos paramet
e
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
unpac
k
_
tre
e
s
.
c: pass unp
a
ck_trees_o
p
t
i
ons structure
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Hamano
add_cache_
e
nt
r
y():
r
emov
a
l
o
f
fi
l
e foo
d
o
e
s
n
ot confli
c
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
M
e
rge branch 'jc/
b
isect'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Mer
g
e
b
ra
n
ch 'fl/doc'
commit
|
commitdiff
|
tree
2007-04-04
J
unio C Ha
m
ano
M
e
rge b
r
anch 'post
1
.
5
.
1/blame
.
el'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Me
r
ge
b
r
anch 'post1
.
5
.
1/tcltk'
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio
C
Hamano
Merge branch 'p
o
s
t
1
.
5
.
1
/
p
4'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ham
a
no
Merge
b
ranch 'lt/dirwalk'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
git-read-tree --index-output=<f
i
le>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
_
G
IT_INDE
X
_O
U
TPUT
:
allow p
l
umbing to ou
t
p
ut
t
o an alterna
t
iv
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C Hamano
checkout:
all
o
w detaching
t
o HEAD e
v
en when swit
c
hing
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
unio C
H
amano
GIT 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C Hama
n
o
Mer
g
e
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
Jun
i
o C Hamano
rer
e
r
e
should not
r
ep
e
at the earlier hunks in later
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-02
Ju
n
io C Hamano
Hopefully
f
i
n
al update to th
e
d
r
aft
Re
l
e
a
s
e
Notes,
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
Junio C
H
amano
Optional Tck/Tk: ign
o
re
g
enerated files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio
C Hamano
D
o
not bother docum
e
nting f
e
tch--tool
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio
C
H
a
mano
Updat
e
draft release notes for 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hama
n
o
Mer
g
e bra
n
ch '
m
aint'
commit
|
commitdiff
|
tree
2007-03-30
Juni
o
C Hamano
Merge
branch 'master
'
of
git:/
/
repo
.
or
.
cz/gi
t
/mergetool
.
g
it
commit
|
commitdiff
|
tree
2007-03-28
J
u
nio C
H
am
a
no
Documentation: unbreak u
s
er
-
manual
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
J
un
i
o C Hamano
GIT 1
.
5
.
1-rc3
commit
|
commitdiff
|
tree
2007-03-28
Jun
i
o C Hamano
Update main gi
t
.
html 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
Mer
g
e branch 'maint' to
s
ynchronize with 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Ju
n
io
C Hama
n
o
GIT 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Jun
i
o
C Hamano
F
i
x "
-
-pretty=form
a
t:"
for pare
n
t related i
t
e
m
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio
C H
a
m
a
no
git
-
c
ommit
:
"read
-
tree -m HEAD"
i
s no
t
the right
way
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Ju
n
io
C
Hamano
sha1_file
.
c (write_sh
a
1_file)
:
Detect close fai
l
u
r
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Junio C Haman
o
Document git
-
log --first-parent
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
J
u
nio C Ham
a
n
o
GIT 1
.
5
.
1-rc
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Ju
n
io C Hamano
M
erge
branch '
j
c/fpl'
commit
|
commitdiff
|
tree
2007-03-26
J
u
n
i
o C Hamano
Update README to
p
oint at a
f
ew k
e
y p
e
riodic
a
l m
e
ssages
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next