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
Ignore merged status of the file-level merge
2007-04-26
Junio C Hamano
M
erge b
r
anch 'm
a
i
n
t
'
commit
|
commitdiff
|
tree
2007-04-26
Junio
C
Hamano
Start pre
p
aring f
o
r
1
.
5
.
1
.
3
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-26
J
unio C H
a
mano
Ad
d
--date={local
,
r
e
lative,d
e
fault}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-25
Junio
C
H
amano
Merge bran
c
h
'
jc/the-i
n
de
x
'
commit
|
commitdiff
|
tree
2007-04-25
Ju
n
io
C Hamano
Me
r
ge b
r
a
n
c
h 'mk/diff'
commit
|
commitdiff
|
tree
2007-04-25
J
u
n
i
o C
H
a
m
ano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-25
Junio C Ha
m
ano
M
e
rge br
a
nch 'mas
t
er'
of git
:
/
/repo
.
or
.
cz/git/
f
ast
i
mport
commit
|
commitdiff
|
tree
2007-04-24
Junio C Ham
a
n
o
applymbox & quiltim
p
o
rt: typofix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
J
u
n
io C Ham
a
no
gitattributes documen
t
ation:
clari
f
y overriding
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
J
u
nio C Hamano
t
/
test-
l
ib
.
sh
:
Protec
t
oursel
v
es from c
o
mmon miscon
f
i
g
uration
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
Diff
b
et
w
een two blobs should t
a
ke mod
e
changes into
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Ju
n
io C Hamano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-24
Juni
o
C Ham
a
no
Build RPM wi
t
h ET
C
_GITCONFIG=/etc/gitconf
i
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Juni
o
C H
a
mano
t6030:
g
r
ab co
m
mit object name as we go
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
J
u
nio C Hamano
t5302:
a
v
o
id using
t
a
i
l -c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Jun
i
o
C
H
a
mano
Do
c
u
ment "diff=driver" attribute
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Ju
n
i
o C Hamano
Make rea
d
-c
a
ch
e
.
c
"t
h
e_
i
n
dex" free
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hamano
Move index-r
e
lated variab
l
es into a
structu
r
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Jun
i
o C Ham
a
n
o
Support
'
diff
=
p
gm'
attribute
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hamano
pack-objects: mak
e
g
ene
r
a
ted packfile
r
ead-only
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio
C
H
amano
Update tests not to assum
e
that
ge
n
era
t
ed packfi
l
e
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio
C
Hamano
Fix 'quic
k
f
ix'
on pack-obje
c
ts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hama
n
o
pa
c
k-objects: quickfix for per
m
ission mode
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C Hamano
Update
d
raft release note
s
f
o
r v1
.
5
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C H
a
m
ano
Documentation/M
a
k
efil
e
: fix
secti
o
n
(5)
inst
a
ll
a
tion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
J
unio C Ha
m
ano
Updat
e
documentati
o
n lin
k
s
t
o
point at v1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
M
e
rge branch 'lt/objalloc'
commit
|
commitdiff
|
tree
2007-04-22
Junio
C Hamano
Me
r
ge branch 'jc/add'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge
b
ranch 'jc/attr'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
M
e
rge branch 'lt/git
l
ink'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Haman
o
M
erge branch 'np
/
pack'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Haman
o
Merge
b
ranch 'jp/refs'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge bra
n
ch
'
jc/
q
uickf
e
tch'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge br
a
nch 'm
a
int
'
commit
|
commitdiff
|
tree
2007-04-21
J
u
ni
o
C Hamano
GIT 1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C
H
ama
n
o
l
o
ckfil
e
: rec
o
r
d
the primar
y
p
r
ocess
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio
C
Hamano
conver
t
.
c: r
e
structur
e
the attribute checking part
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
Fix bogus link
e
d-list mana
g
e
m
ent for
u
ser d
e
fi
n
ed merg
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
g
i
t
-clone: fix
d
u
mb p
r
otocol transport t
o
clone from
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
g
i
t-ad
d
-
u:
m
atch the i
n
dex w
i
th working t
r
e
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-20
Juni
o
C Hamano
Do
c
um
e
nt gita
t
tributes(5
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Upd
a
te 'crlf' attribute semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C
H
a
mano
Docum
e
ntation: support manual s
e
ction
(5) - file formats
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio
C Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-19
Junio C
Ham
a
no
Simpli
f
y code to find recursive merge dr
i
ver
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Ju
n
io C Hamano
Counto-fix i
n
me
r
ge-recursive
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C H
a
mano
Fix fu
n
ny
t
y
p
es u
s
e
d in attribu
t
e va
l
ue
r
epresentation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C H
a
mano
Allow low-level driver to specify diffe
r
ent
b
e
h
aviour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Hamano
Custom low-lev
e
l merge driver:
c
hange
t
he
co
n
figu
r
ation
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Allow
the default low-level
m
erge driver to
b
e c
o
nfigured
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C Hamano
C
u
sto
m
l
o
w
-
le
v
el
m
erge driver su
p
port
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io
C
Hamano
Merge
b
ranch '
f
l/cvsserve
r
'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2007-04-18
J
unio C
H
amano
Up
d
ate dra
f
t release notes for
1
.
5
.
2
w
ith accumu
l
a
t
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Ham
a
n
o
M
e
rge branc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-18
J
unio C H
a
m
a
n
o
S
t
ar
t
prepa
r
ing for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Junio
C H
a
man
o
M
erge bra
n
ch 'master
'
of git://re
p
o
.
or
.
cz/
g
it-gui
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge
b
ranch 'maint' of git://repo
.
o
r
.
c
z
/
git
-
gui into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
J
u
ni
o
C Ham
a
n
o
M
e
rg
e
branch 'jc/rea
d
-
t
re
e
-df'
commit
|
commitdiff
|
tree
2007-04-17
J
u
nio C Haman
o
Ad
d
a demo
n
stration/tes
t
o
f
c
ustomized
m
e
rge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ha
m
ano
Allow specifyin
g
special
i
zed merg
e
-bac
k
end per pa
t
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C
H
amano
git-gui: Hon
o
r TCL
T
K_PATH
if suppl
i
ed
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C
H
ama
n
o
merge-recursive
:
sep
a
rate ou
t
xdl_merge() interface
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C H
a
mano
Allow more th
a
n
t
rue/false t
o
attributes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C
H
amano
M
a
k
e sure quickfe
t
ch i
s
not fo
o
led
w
ith a previous
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Junio C
H
a
ma
n
o
Merge branc
h
'js/wra
p
-log
'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
se
n
d-email: d
o
not leave an
empty
CC: line if no cc
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Ju
n
io
C Hamano
Merg
e
branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-16
J
unio C Hamano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-15
Junio
C
H
amano
Cha
n
ge attribute n
e
g
ation ma
r
ker from '!' to '-'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
H
amano
Defin
e
a built-in attribute ma
c
ro "binary"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
unio
C H
a
m
ano
attribute macr
o
su
p
port
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Juni
o
C
Hamano
Makefile: a
d
d
p
atch-
i
ds
.
h back in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Ham
a
no
F
i
x 'diff' attribute s
e
m
antics
.
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
s
ema
n
tics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Ha
m
ano
Merge git://git2
.
kernel
.
org/pub
/
scm/
g
itk
/
gi
t
k i
n
to
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C
Ha
m
a
n
o
Teach 'dif
f
'
a
bout 'diff' att
r
ibute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Jun
i
o C Hamano
De
f
ine 'crlf' attribu
t
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
J
unio C Hamano
Add basic inf
r
astructur
e
to
ass
i
gn
a
ttributes to paths
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C
H
am
a
no
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Replace a pair of patches with
upda
t
ed ones for subp
r
oj
e
ct
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C
H
amano
Do not default
to --no
-
index w
h
en gi
v
en two
directo
r
ies
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Junio
C Ham
a
no
Merge b
r
anch '
j
c/cherry
'
commit
|
commitdiff
|
tree
2007-04-13
Junio C
H
amano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2007-04-13
Jun
i
o C Hamano
Fix git {log,show,
.
.
.
} --pret
t
y
=emai
l
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
unio C Hamano
D
ocumentation:
-
-cherry-pick
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
git-lo
g
--cherry-pick A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Ju
n
io
C
H
a
ma
n
o
Refactor p
a
tch-id filtering out of git-cherry and git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Haman
o
Add
%
m
to '-
-
prett
y
=format:'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Ham
a
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-12
J
unio C H
a
man
o
GIT 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Juni
o
C H
a
m
an
o
fsck: do not c
o
mplain
o
n detached HEAD
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
u
nio C Hamano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
gi
t
-fetch:
u
se
fe
t
ch--t
o
ol
p
ick-
r
ref to
avoid lo
c
a
l
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
git-fetch--tool p
i
ck-r
r
ef
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C
Haman
o
t3030: merge-r
e
c
u
rsive
backend test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io C H
a
man
o
merge-
r
ecursi
v
e:
h
andle D/F conf
l
ict case more
car
e
fully
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio
C H
a
mano
merge-recursive: do not barf on "to be
removed" entries
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next