repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'mk/diff'
2007-04-25
Junio C Ha
m
ano
Merge bran
c
h 'mk/diff
'
commit
|
commitdiff
|
tree
2007-04-25
Junio C Hamano
Merge bra
n
ch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-25
Junio C Ha
m
ano
Merge bran
c
h 'maste
r
'
of
g
it://repo
.
or
.
cz/git/fastimport
commit
|
commitdiff
|
tree
2007-04-24
Jun
i
o
C H
a
m
ano
applymbox & quilt
i
mport:
t
y
po
f
ix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
gitatt
r
i
b
utes
documentation
:
clarify ov
e
rriding
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hama
n
o
t/test-l
i
b
.
sh: P
r
ote
c
t o
u
rselves from
common
m
isconfiguration
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
D
iff b
e
tween two blobs should take mode
c
hanges into
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-24
J
un
i
o C H
a
mano
B
ui
l
d RPM with ETC_GITCONFIG=/etc
/
gitconfig
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hama
n
o
t6030: grab commit ob
j
ect name as we go
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
J
u
n
i
o
C Ham
a
no
t5302: a
v
oid using tail -c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hamano
Do
c
um
e
nt "diff=dr
i
ver" attribute
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C H
a
mano
Suppor
t
'diff=pgm' attribute
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Juni
o
C
H
a
m
ano
pack-objects: make gener
a
te
d
packfile read-only
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C
H
amano
Upd
a
te tests not to a
s
sume th
a
t generated pac
k
file
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Ham
a
no
F
ix 'quickfix' on pack-ob
j
ects
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
J
unio C H
a
mano
pack-o
b
jec
t
s: qui
c
kfix fo
r
permission mod
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C H
a
mano
U
p
date draft release not
e
s
for v1
.
5
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
D
ocu
m
entation/Makefile: fix
sec
t
i
on
(
5) installation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
J
unio C Hama
n
o
Update do
c
umentat
i
on links to poi
n
t
a
t v1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge branc
h
'lt/objallo
c
'
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C Ham
a
no
Merge branch 'jc/
a
dd'
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C Hamano
Merge
b
ra
n
ch 'jc/
a
ttr'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Haman
o
Merge branch
'
lt/git
l
ink'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge branch '
n
p/pack'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Ha
m
ano
Merge branch 'jp/refs'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
M
e
rge
b
ranch 'jc/qui
c
kf
e
tch'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
M
e
r
ge b
r
an
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-21
Junio
C
H
a
mano
GI
T
1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Ju
n
io C
H
amano
lockfile: record the
p
rimary process
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio
C
Hamano
convert
.
c: restr
u
ct
u
re the attr
i
bute
c
hecking part
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
J
u
nio C Hamano
Fix
b
ogus linked-list manage
m
ent for user defined m
e
r
g
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C
Hamano
git-clone: fix dumb pro
t
ocol transport to
c
lone f
r
om
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
J
u
n
i
o
C Ha
m
a
n
o
git-ad
d
-u: match
t
he in
d
e
x
with
working t
r
e
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio
C Hamano
Merge
b
r
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-04-20
Junio C H
a
mano
Document
git
a
ttribu
t
es(5)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Update 'cr
l
f
' attribute
s
emantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio
C
H
amano
Documentation: suppo
r
t manual section (
5
) - file formats
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Haman
o
Me
r
g
e bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-19
J
unio C
H
amano
Simplif
y
code
t
o
f
i
nd re
c
ursi
v
e
m
er
g
e d
r
iver
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio C
H
a
m
an
o
Counto-fix in merge-
r
e
c
ursive
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Haman
o
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C
H
ama
n
o
Fix funn
y
t
y
p
e
s used in attrib
u
te value r
e
prese
n
tati
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io
C
Hama
n
o
Allow l
o
w
-
l
evel dri
v
er
to specify dif
f
e
r
ent
be
h
aviour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C Hamano
Custom
l
ow-l
e
vel mer
g
e dri
v
er: change th
e
configura
t
ion
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ham
a
no
All
o
w the default low-
l
evel
m
erg
e
driver
t
o be configured
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C Hamano
Custom
low-level
m
e
r
ge driver
suppor
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
unio C
Hamano
Me
r
ge branch 'fl/cvsserver'
commit
|
commitdiff
|
tree
2007-04-18
Junio C H
a
man
o
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Updat
e
dra
f
t rel
e
ase notes for
1
.
5
.
2 with accumulated
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C Ha
m
a
no
Mer
g
e b
r
anch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Haman
o
St
a
r
t
prepar
i
ng for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
J
unio C
H
a
mano
Merge branch 'master'
o
f g
i
t:
/
/repo
.
or
.
cz/
g
it-gui
commit
|
commitdiff
|
tree
2007-04-18
Junio C H
a
mano
Merge
branch '
m
aint' o
f
git://
r
epo
.
or
.
cz/git
-
g
u
i int
o
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Junio
C Ham
a
no
Merge branch 'jc
/
read
-
tree
-
df'
commit
|
commitdiff
|
tree
2007-04-17
Junio
C
H
amano
Add a
d
e
m
onstra
t
ion/test of customized merg
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hama
n
o
A
l
low s
p
ecifying
specia
l
ize
d
merge-backend pe
r
path
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
unio C Ha
m
ano
g
i
t-gui: Honor
T
CLTK_PATH if supplied
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
u
nio C Ha
m
a
n
o
merge
-
recursive: separa
t
e o
u
t xdl
_
merge()
i
nte
r
face
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Haman
o
Al
l
ow
m
ore
t
h
an true
/
false to attr
i
butes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C
Ha
m
ano
M
a
ke sure quickfetch is not
f
oo
l
ed with a previo
u
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
J
u
n
io C Hama
n
o
Merge branch
'j
s
/wrap-log'
commit
|
commitdiff
|
tree
2007-04-16
Ju
n
io C Hamano
send-email: do not leave an empty CC: li
n
e
i
f
no cc
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Junio C
H
amano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
M
e
rge bran
c
h 'maint
'
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio C
Ham
a
no
Change attribute
n
egatio
n
m
a
r
ker from '!' to '-'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Juni
o
C Hamano
Define a built-i
n
a
t
t
ribute macr
o
"binary
"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
attribute m
a
cr
o
support
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o C H
a
mano
M
a
kefile: a
d
d patch
-
ids
.
h back in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C H
a
ma
n
o
Fix 'diff' attribute semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Ha
m
ano
Fix 'crlf' attribute semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Ham
a
no
M
e
r
g
e git://git2
.
kernel
.
org/pub/scm/gitk/gitk into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Teach 'di
f
f' about 'd
i
f
f
' att
r
ibute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
D
e
fine 'crlf
'
attr
i
b
ute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
io
C
Hamano
Add ba
s
ic infrastru
c
ture t
o
assign attribu
t
es to pat
h
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-14
Junio C H
a
m
a
no
Repl
a
ce a
p
ai
r
of patches
w
ith updated o
n
es f
o
r subproject
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
i
o C Hamano
Do not defau
l
t t
o
--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
aman
o
Merge branch 'jc/cherry'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Haman
o
Merge bran
c
h '
m
aint'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
F
i
x git {log
,
sho
w
,
.
.
.
}
--pretty=e
m
a
il
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hama
n
o
D
ocumentation:
--cherry-pick
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o C Hama
n
o
git-log --c
h
erry
-
pick
A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
io C H
a
mano
Refacto
r
patch
-
id filt
e
ring out of git-
c
he
r
r
y
and git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C
H
a
m
ano
Add %m to '-
-
pr
e
tty=for
m
a
t
:
'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-12
Junio
C
Ha
m
a
n
o
G
IT 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Junio C Haman
o
fsc
k
: do not complain on detached
HEAD
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
M
e
rge branch
'
maint
'
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
git-fetch: use
fetch-
-
too
l
pi
c
k-rref to avoi
d
loca
l
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Juni
o
C
Haman
o
git-fe
t
ch--tool pick-r
r
ef
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C
H
amano
t3030
:
merge-recursi
v
e bac
k
en
d
test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
unio C Ham
a
no
me
r
ge-recur
s
i
ve: handle D/
F
con
f
lict case m
o
re carefully
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hama
n
o
m
e
rge
-
re
c
ursive: d
o
not bar
f
on "to be removed" entries
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io C H
a
m
ano
Treat D/F conflict
e
n
tr
y
more carefull
y
in
unpack
-
trees
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
t100
0
: fix c
a
s
e
ta
b
le
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Jun
i
o
C
H
a
m
an
o
shortlo
g
-w:
m
ake wrap-line behaviour optional
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Jun
i
o C H
a
mano
Merge bran
c
h
'
jc/push'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hama
n
o
Merg
e
branc
h
'
j
c
/
merge-subtree'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merge branch
'js/fetc
h
-
p
rogress'
commit
|
commitdiff
|
tree
next