repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Split out mailmap handling out of shortlog
2007-04-29
Junio C Hamano
Split o
u
t
ma
i
lmap han
d
lin
g
o
ut of shortlog
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Jun
i
o
C
Ha
m
ano
blame -s: suppress author n
a
me and t
i
m
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
J
u
nio C Hamano
Merge commit 'gfi/master'
commit
|
commitdiff
|
tree
2007-04-29
Junio C Hamano
Merg
e
branch '
m
ai
n
t'
commit
|
commitdiff
|
tree
2007-04-29
J
unio C H
a
m
ano
Fix i
m
port
-
tars fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio C Hamano
Upd
a
te
.
ma
i
lmap wit
h
"Michael"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
J
unio C Hama
n
o
Do
n
ot barf on too long action de
s
cription
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio C
Ha
m
ano
Me
r
ge branch 'maint' of git:/
/
rep
o
.
o
r
.
cz/git/fastimp
o
rt
.
.
.
commit
|
commitdiff
|
tree
2007-04-27
J
u
n
i
o C
H
a
mano
Merg
e
branc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-26
Junio C Hamano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2007-04-26
Junio
C
H
amano
Start prep
a
ring for
1
.
5
.
1
.
3
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-26
Junio C Hamano
Add --date={local,relat
i
ve,default}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-25
Ju
n
io C Hama
n
o
Merge b
r
anch 'jc/
t
he-in
d
ex'
commit
|
commitdiff
|
tree
2007-04-25
Junio C Ham
a
no
Merg
e
branch 'mk/diff'
commit
|
commitdiff
|
tree
2007-04-25
Jun
i
o
C Haman
o
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2007-04-25
Junio C Hamano
Merge branch 'master
'
of git://repo
.
or
.
cz/git/fa
s
timp
o
rt
commit
|
commitdiff
|
tree
2007-04-24
Junio C
H
amano
applym
b
ox & qui
l
timp
o
rt: ty
p
of
i
x
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
J
u
ni
o
C
H
amano
git
a
t
t
rib
u
tes documentation: clarify
overriding
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Ha
m
ano
t/test-l
i
b
.
s
h
: Pro
t
ect ourselves f
r
o
m c
o
m
mon m
i
sconfig
u
r
ation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Jun
i
o
C Ha
m
ano
Di
f
f betwee
n
t
w
o blobs should take
m
ode c
h
ang
e
s into
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C H
a
m
a
no
Merge branch 'm
a
int
'
commit
|
commitdiff
|
tree
2007-04-24
Junio C
Haman
o
B
u
ild RPM with ET
C
_GITCONFIG=/etc/gitconfig
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
J
u
nio C Hamano
t6030
:
grab commit object n
a
me
a
s we
g
o
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Juni
o
C Hamano
t5302: av
o
id u
s
i
n
g tai
l
-c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hama
n
o
Document "dif
f
=driv
e
r" attribute
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Ju
n
io C Haman
o
Make read-cache
.
c "the_index
"
f
ree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
J
unio C
H
amano
Move
ind
e
x-related vari
a
bles in
t
o a structure
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Ju
n
io C Hamano
S
u
pport '
d
if
f
=pg
m
' attribute
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
J
u
nio C Hamano
pa
c
k-objects:
make g
e
nerated p
a
ckfile read-only
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hamano
U
p
dat
e
tests
n
o
t
to a
s
sume tha
t
generated pack
f
iles
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
J
unio C
H
a
mano
Fix 'quickfix' on pack
-
obj
e
cts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
J
unio
C
Hama
n
o
pack-o
b
jec
t
s: quickfix for
permission modes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Update draft release notes for v1
.
5
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Do
c
ument
a
tion/Mak
e
f
i
l
e: fix se
c
tion (5) installation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
io
C Ha
m
a
no
Update
docum
e
ntation
l
i
nks to
poin
t
at
v1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
J
unio C
H
amano
Merge branc
h
'lt/objalloc'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge b
r
anch 'jc/add'
commit
|
commitdiff
|
tree
2007-04-22
Junio
C
Hamano
Merg
e
b
ra
n
ch 'j
c
/attr'
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C H
a
m
a
no
Me
r
g
e b
r
anch 'lt
/
gitl
i
nk'
commit
|
commitdiff
|
tree
2007-04-22
Jun
i
o C Hamano
M
e
rge bra
n
ch 'np/pack'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Ham
a
no
M
erge
b
r
a
nch
'
jp/re
f
s'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Ha
m
ano
M
e
rge
branch 'jc/
q
u
i
ckfetch'
commit
|
commitdiff
|
tree
2007-04-22
J
unio
C
Ham
a
no
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
GIT 1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
J
u
n
io C Hamano
lockfi
l
e: record the pr
i
mary proc
e
ss
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
convert
.
c:
r
estructure the
a
ttri
b
u
t
e checking part
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Jun
i
o C Hamano
Fix bogus linked-li
s
t ma
n
a
g
ement for u
s
er defined merg
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Jun
i
o C Ha
m
ano
git-clone:
f
ix dum
b
protocol transport
to clon
e
f
r
om
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
git
-
add -u: mat
c
h
the ind
e
x
with worki
n
g
tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Ju
n
io C Hamano
M
e
rge
branch '
m
a
i
nt'
commit
|
commitdiff
|
tree
2007-04-20
Juni
o
C Hamano
D
o
cument
g
itattr
i
b
u
t
es(5)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Updat
e
'cr
l
f' a
t
tribut
e
se
m
a
n
t
i
c
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Document
a
tion: support manual
s
ection (5)
- f
i
le forma
t
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Jun
i
o
C
Haman
o
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2007-04-19
Junio C Ham
a
no
Simplify
c
o
d
e
to find recu
r
sive merge
d
r
i
ve
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio
C Hamano
Counto-fix in merge-recursive
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
J
uni
o
C Hamano
Fix
f
unny
t
y
pes used in attribute va
l
u
e representat
i
on
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Allow low-level
d
river to specify d
i
f
ferent
b
e
h
aviour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
un
i
o C Ha
m
ano
C
us
t
om lo
w
-
level merge drive
r
: cha
n
ge
t
he
c
onfi
g
urati
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
A
l
l
ow the def
a
ult
l
o
w
-
level merge driver
to be
c
o
nf
i
gured
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
i
o C Ha
m
ano
Cus
t
om low-level merge
driver support
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
i
o C Ham
a
no
Merge branch 'fl/c
v
sserver'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ha
m
ano
M
erge
b
ranch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C
Ham
a
no
Upda
t
e
draf
t
rele
a
se n
o
t
e
s
for 1
.
5
.
2 with accumulated
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
M
e
rge branch
'
maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Hamano
Start preparing
f
or 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
J
u
n
io
C
Hamano
M
e
rge bran
c
h '
m
aster' of git
:
//repo
.
or
.
cz/git-g
u
i
commit
|
commitdiff
|
tree
2007-04-18
Junio
C Hamano
Merge
b
r
an
c
h 'maint'
of git://repo
.
or
.
cz/git-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Junio
C Ha
m
ano
Merge br
a
nch 'j
c
/r
e
ad-
t
r
e
e-df'
commit
|
commitdiff
|
tree
2007-04-17
Junio
C
Hamano
Add a demonst
r
ation/
t
e
st of customized merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C
H
am
a
no
A
l
low specifying
specialized m
e
rge-backe
n
d
p
er
path
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
u
nio C Hamano
git-gui: Honor
T
C
LTK_PATH if supplied
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
i
o
C Hamano
m
e
rge-recursive: separa
t
e out xdl_merge()
i
n
t
erface
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Juni
o
C Hamano
Allow mo
r
e
t
h
a
n true/
f
alse to attribut
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io C Ham
a
no
Mak
e
sure quickfetch is n
o
t fooled with a pre
v
ious
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Haman
o
Merge
branc
h
'js/wrap-l
o
g'
commit
|
commitdiff
|
tree
2007-04-16
Junio
C Hamano
send-
e
mail:
d
o
not le
a
ve an empt
y
C
C: lin
e
if no
cc
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-15
Juni
o
C Hamano
Change attribute
n
egatio
n
marker
f
rom '!'
to '-'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
Hama
n
o
Define a built-
i
n attribute
m
acro "bina
r
y"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
u
ni
o
C Haman
o
attribute m
a
cro support
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
H
amano
Makef
i
le: add patch-ids
.
h back in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io C Haman
o
F
i
x 'diff' attribute semanti
c
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Ham
a
n
o
Fix 'crlf' attrib
u
te semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
unio C
H
amano
Mer
g
e
g
i
t:/
/
git2
.
ke
r
nel
.
org/pub/scm/gitk
/
g
it
k
into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio
C
H
ama
n
o
Teach '
d
iff'
a
b
o
ut 'diff' attribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Ham
a
no
De
f
ine 'crl
f
' attribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
i
o
C Hamano
Add basic infrastructure to as
s
ign attributes
t
o paths
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Ham
a
no
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C Hama
n
o
Replace a pair of
p
a
tches wi
t
h upda
t
ed ones
f
o
r
su
b
project
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
J
u
nio C Hamano
D
o not default to
-
-no-
i
nde
x
when given two dir
e
ctories
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Junio C Ha
m
a
no
M
e
rge branch
'
jc/che
r
ry'
commit
|
commitdiff
|
tree
2007-04-13
Junio
C
Hamano
Merge bra
n
ch
'
maint'
commit
|
commitdiff
|
tree
2007-04-13
J
u
n
i
o C Hamano
Fix git {log,show,
.
.
.
} --pretty=email
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Docume
n
tat
i
on: --cherry-pick
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
u
nio C Haman
o
git-
l
og --cher
r
y-pick A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Ham
a
no
Refactor patch-id filterin
g
out
o
f gi
t
-cher
r
y and git
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hama
n
o
Ad
d
%m to
'
--pret
t
y=form
a
t:'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next