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
Merge branch 'jc/attr'
2007-04-22
Ju
n
i
o
C Ha
m
ano
Merge
branch 'jc/attr'
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C Hamano
Merge
branch 'lt/gitl
i
nk
'
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C Hamano
Merge branch 'np/pack'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge branch '
j
p/refs'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge
b
r
a
nc
h
'jc/q
u
ic
k
fetch'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hama
n
o
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-21
J
u
nio
C
H
amano
G
IT 1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
lockfile
:
r
e
cord the prim
a
ry
p
r
ocess
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio
C
Hama
n
o
convert
.
c: r
e
structure the att
r
ibute checking
p
art
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Haman
o
Fi
x
bogus linked-list management f
o
r user defined m
e
rge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
git-cl
o
ne: fix dumb protocol tr
a
nsport t
o
clone from
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Haman
o
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2007-04-20
J
unio C Hama
n
o
Document gi
t
attributes(5)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Jun
i
o C Ha
m
ano
Update 'crl
f
' attribut
e
sem
a
n
t
ics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Juni
o
C Hamano
Documentation: support ma
n
u
a
l section (5
)
- file f
o
rm
a
t
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Jun
i
o C Hamano
Merge
b
ran
c
h 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
Si
m
plify
c
od
e
to find recursive me
r
ge driver
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hama
n
o
Counto-fix
i
n
merge-recursive
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge
b
ra
n
ch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Fix f
u
n
n
y
types used in
a
t
tribute val
u
e repre
s
entation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Hamano
Al
l
ow low-level driver
t
o sp
e
ci
f
y different behavi
o
ur
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Hamano
Custom low-level merge driver: chang
e
t
he configur
a
t
ion
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C
H
a
mano
Allow t
h
e
default
low-l
e
vel
m
erge driver to
b
e
configured
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
unio C Hamano
C
u
st
o
m low-level me
r
ge d
r
iver support
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ham
a
no
M
erge branch 'fl/
c
vsser
v
e
r
'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Me
r
ge
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Ha
m
ano
U
p
dat
e
draft release notes f
o
r
1
.
5
.
2 with accumu
l
ated
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Haman
o
S
tart p
r
e
paring for
1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Hamano
M
erge branch 'master' of git:
/
/repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2007-04-18
Junio
C Hamano
Merge
branc
h
'maint' o
f
gi
t
://rep
o
.
or
.
cz
/
git-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Juni
o
C Hamano
Me
r
ge branc
h
'jc/read-tree-df'
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ham
a
n
o
A
d
d a
dem
o
nstrat
i
on/test of c
u
stomized merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io
C Haman
o
A
l
low speci
f
y
i
ng specialized
merg
e
-backend per path
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
unio C
Hamano
git-gui:
H
o
n
or
T
CLTK
_
PA
T
H
if suppli
e
d
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Jun
i
o C
H
a
mano
m
e
rge-recu
r
sive
:
se
p
ar
a
te out xdl_merge() interface
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ha
m
ano
All
o
w more than true/false to
attributes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Make sure q
u
ickfetch is not fooled with
a
previous
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
Merge bra
n
ch 'j
s
/wrap-log'
commit
|
commitdiff
|
tree
2007-04-16
Ju
n
io C Hamano
send-e
m
a
il: d
o
not leave an e
m
pty
C
C
:
line
if
n
o c
c
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
J
unio C Haman
o
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
Merg
e
br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-04-15
Junio
C
Haman
o
Ch
a
n
g
e
attribut
e
negati
o
n
ma
r
ke
r
fr
o
m '
!
'
to '-'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
H
amano
Defi
n
e
a built-in attribute m
a
cro "bina
r
y"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Haman
o
attribute m
a
cro sup
p
ort
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Makefil
e
: add patch-ids
.
h back
in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C H
a
mano
F
ix 'diff' att
r
ibu
t
e semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io C Hamano
Fix
'crlf' attribu
t
e sema
n
tics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
unio C Haman
o
Me
r
g
e
g
it://git2
.
kernel
.
org/pu
b
/scm/g
i
tk/gitk i
n
to
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
io C
Hamano
Teach 'dif
f
' about 'dif
f
' attribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hama
n
o
Define 'cr
l
f
'
a
t
tribu
t
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
J
u
n
i
o C
H
amano
Add ba
s
ic infrastructure to assign a
t
tr
i
bute
s
to
path
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
io C
H
amano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-14
Junio C
Hamano
Repl
a
ce a
pai
r
o
f
p
atc
h
es with update
d
on
e
s for
s
u
b
project
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C
Hamano
Do
n
ot defaul
t
to --no-
i
ndex w
h
e
n given tw
o
directories
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Ju
n
io C Haman
o
Merge branch 'jc
/
cherry'
commit
|
commitdiff
|
tree
2007-04-13
Juni
o
C Hama
n
o
Merge b
r
anch
'
mai
n
t
'
commit
|
commitdiff
|
tree
2007-04-13
J
u
nio C Hama
n
o
Fi
x
g
it {
l
og,sh
o
w,
.
.
.
} --pretty=
e
mail
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
unio C Hamano
Documentation: --che
r
ry-pic
k
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C
Hamano
git-log --cher
r
y-
p
ick A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio
C Hama
n
o
Refactor pa
t
ch
-
id fi
l
tering out of
g
it-cherry and git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Ha
m
ano
Add
%
m
t
o
'--pretty=format:'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Merge b
r
anch
'maint'
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
G
IT 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Junio C Hamano
fsck: d
o
not co
m
plain on detached H
E
A
D
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Jun
i
o
C
Hamano
M
erge b
r
a
nc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-10
Junio C Ha
m
ano
git-fetch
:
us
e
fetc
h
-
-
to
o
l pick-rre
f
to avoid loca
l
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Ham
a
no
git-fet
c
h--tool
p
ic
k
-rref
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Juni
o
C Hamano
t3030: merge-recursive back
e
nd t
e
s
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
merge-recu
r
sive: handl
e
D/F
c
onflic
t
case more carefully
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io C Hamano
merge
-
r
e
cursive: do no
t
barf on "to
b
e re
m
oved" ent
r
ies
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
Treat D/F conflict
e
ntry more care
f
u
l
ly
i
n unpack-trees
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
t1000:
fix case table
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C
Hamano
shortlog
-w: ma
k
e wrap-line behaviour optiona
l
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
M
erge branch '
j
c/push'
commit
|
commitdiff
|
tree
2007-04-09
Jun
i
o C
Ham
a
no
Me
r
ge
branc
h
'jc/m
e
rge-
s
ubtre
e
'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
J
unio C
Hamano
Merge branch 'js/fetch-progre
s
s'
commit
|
commitdiff
|
tree
2007-04-09
Jun
i
o
C
Hamano
Me
r
g
e branch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
A
d
d
Documentation/cmd-list
.
made
t
o
.
gitignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
J
unio C H
a
mano
Start 1
.
5
.
2 cycle b
y
p
repareing RelNotes for it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Ju
n
i
o
C Hamano
Merge branch '
j
c/read-tree-df'
(
early part)
commit
|
commitdiff
|
tree
2007-04-08
Junio
C
Ham
a
no
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-08
Juni
o
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 Hamano
A n
e
w
merge st
r
agety 'subtr
e
e'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
u
n
i
o C Hamano
git-pu
s
h to multiple locations does not s
t
op
a
t
the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Haman
o
g
i
t
-
push repor
t
s
t
he UR
L
after failing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
M
e
r
g
e branch 'jc/index-output
'
commit
|
commitdiff
|
tree
2007-04-07
Junio
C Hama
n
o
Merge
b
r
a
nch 'fp/make-j'
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
H
a
ma
n
o
M
e
rge b
r
anch 'cc/bisect'
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
i
o
C
Hamano
Merge branch 'jc/checkout
'
(early
p
art)
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Documenta
t
ion: tighten d
e
pendency for git
.
{html,
t
xt}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hama
n
o
git-
b
isect: a
l
low
bisecting
w
ith on
l
y
one
bad
c
ommit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
unio C
H
a
mano
t6030:
a
dd
a
bit mo
r
e
t
ests to git
-
bisect
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
J
unio C Hamano
git-
b
i
sect: moderni
z
ation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
M
erge branc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-05
Junio C Ha
m
ano
Ren
a
me
a
dd_file_t
o
_index() to add_file
_
to_cache()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Juni
o
C Hamano
Rename
static variable write_index to
update_index
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Rename internal func
t
i
o
n
"ad
d
_file_
t
o_cache" in builtin
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Propaga
t
e cache
e
rror internal
to ref
r
esh_cache() via
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next