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
J
u
nio C Hamano
Split out mai
l
m
ap hand
l
i
n
g out
o
f sho
r
tlog
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-29
Junio C Hamano
blame -s:
suppress a
u
thor name a
n
d time
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-29
Junio C Hamano
Merg
e
commit '
g
fi/master'
commit
|
commitdiff
|
tree
2007-04-29
J
u
nio C Hamano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-29
Junio C Ham
a
n
o
F
i
x import-tars fix
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-29
Junio
C
Ha
m
ano
Up
d
ate
.
m
a
ilmap with
"Michael"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-29
Junio
C
Hama
n
o
Do not barf on too long actio
n
description
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-29
Junio
C
Hamano
M
erge bra
n
c
h 'maint' of git://r
e
po
.
or
.
cz/g
i
t/fastimpo
r
t
.
.
.
commit
|
commitdiff
|
tree
2007-04-27
Junio
C
Hamano
M
erge
b
ran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-26
Jun
i
o C
H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-26
Junio C
Hama
n
o
Start preparing for 1
.
5
.
1
.
3
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-26
J
u
nio C Hamano
Add --d
a
te={local,relative,defaul
t
}
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-25
Junio C
H
amano
Me
r
ge
branch 'jc/
t
he-
i
n
dex'
commit
|
commitdiff
|
tree
2007-04-25
Junio C Hama
n
o
Merge
branch 'mk
/
d
i
ff'
commit
|
commitdiff
|
tree
2007-04-25
Junio C Hamano
Merg
e
branch
'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-25
Junio C Hamano
Merge branch
'
master
'
of gi
t
://repo
.
or
.
cz/g
i
t
/
fastimpor
t
commit
|
commitdiff
|
tree
2007-04-24
J
unio C Hamano
applymb
o
x &
q
uiltimp
o
rt:
t
ypofix
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
Junio C H
a
mano
gitattri
b
ute
s
documentation: clarify overrid
i
n
g
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hama
n
o
t/test-lib
.
s
h: Protect ourselves
from common
misconfigurati
o
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
Junio
C
H
a
mano
Diff between two blobs
s
hou
l
d
take mode
c
hanges int
o
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
Junio C H
a
mano
Merge branc
h
'maint
'
commit
|
commitdiff
|
tree
2007-04-24
Juni
o
C Hamano
Bu
i
ld RPM wit
h
ETC_GITCONFIG=/et
c
/
gitc
o
nfig
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Haman
o
t6030: grab commit
object name a
s
we go
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
Junio
C
Hama
n
o
t5302: av
o
i
d using tail -c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hamano
Docume
n
t "diff=driv
e
r
"
a
ttribut
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hamano
Make read-cac
h
e
.
c "the_ind
e
x" free
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hamano
Move index-related v
a
r
i
ables into a s
t
ructure
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Junio C
Ham
a
no
S
upport
'
diff=pgm
'
attribu
t
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Hama
n
o
pack-objects: make generated packfile re
a
d-onl
y
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
J
unio C Ham
a
no
Update tests not to ass
u
me that g
e
nerated
p
ackfiles
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C
H
a
mano
Fix 'quickfix' on pack
-
objects
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
J
unio C Hamano
pack-objects: quickfix f
o
r
permission modes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hama
n
o
U
pdate draft
rele
a
se
note
s
f
or v1
.
5
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Haman
o
Documenta
t
ion/Makefile: fix secti
o
n
(
5) in
s
tallation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Ham
a
no
Update documentation links to point at v1
.
5
.
1
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge branch 'lt/objalloc'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
M
e
rge br
a
nch 'j
c
/add'
commit
|
commitdiff
|
tree
2007-04-22
Junio C
Hamano
Merge
b
ranch 'jc/at
t
r'
commit
|
commitdiff
|
tree
2007-04-22
Junio C
H
a
mano
Merge branch
'
lt/gi
t
l
i
n
k
'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
M
e
rge b
r
anch 'np/pack'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merge branch 'jp/refs'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Ham
a
no
Merge
b
ranch 'j
c
/quickfe
t
ch'
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C Ham
a
no
Me
r
ge b
r
an
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-21
Junio
C Ha
m
a
n
o
GIT 1
.
5
.
1
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio C
H
amano
loc
k
file
:
record the primary
process
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
J
u
nio C Hamano
c
onvert
.
c
:
re
s
truct
u
re the attribute checking part
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
Fix bogus li
n
ked
-
list m
a
nagem
e
n
t
for user
d
efined m
e
rge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Ju
n
io C Ham
a
no
git-clone: fix dumb protocol
t
ransport to clon
e
from
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Haman
o
git-add -u: matc
h
th
e
index
with wo
r
king tr
e
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio
C
Hamano
M
e
rg
e
br
a
n
c
h 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-20
Ju
n
io C
Hamano
Docume
n
t
g
itattributes(5)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C
Haman
o
U
p
date 'crlf
'
a
ttribu
t
e se
m
an
t
ic
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Documentat
i
on: support manual section (5) - file formats
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio C H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-19
Junio
C
Hamano
S
implify c
o
de to find recursive m
e
rge driver
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio C H
a
mano
Counto-
f
i
x
in m
e
rge-recursive
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C Ham
a
no
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Fix
f
unny t
y
pes used in a
t
tribute
valu
e
r
ep
r
esentation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C Hamano
Allow
l
ow-l
e
vel
d
r
i
ver to
s
p
e
cify
d
ifferent behavio
u
r
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C
H
a
m
ano
C
ustom low-level merge
driver:
c
han
g
e the
configuration
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Allow the defau
l
t low-level
m
erge driver to be config
u
red
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
u
n
io C Hamano
Custom low-
l
evel merge drive
r
s
u
pport
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Hamano
Merg
e
branch 'fl/c
v
sserver
'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge br
a
nch
'
main
t
'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Upda
t
e draft
release
n
otes fo
r
1
.
5
.
2 with a
c
cumula
t
ed
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
amano
Star
t
pre
p
a
ring fo
r
1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o
C Ha
m
a
n
o
M
e
r
ge branch
'
master' o
f
git://
r
ep
o
.
or
.
cz/gi
t
-gui
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C H
a
ma
n
o
Me
r
ge
br
a
n
c
h
'maint' of git
:
//repo
.
or
.
cz/git-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
J
u
nio C
Hamano
Merge branch 'jc/
r
e
ad-t
r
ee
-
df'
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ha
m
a
no
Add a demonstration/tes
t
o
f customized merge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
J
u
ni
o
C Hamano
A
llow s
p
ecifying sp
e
cialized merge-
b
ackend per path
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Jun
i
o
C
Hamano
g
i
t-g
u
i: Hon
o
r
TCLTK_PATH if suppl
i
ed
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Juni
o
C Hamano
m
e
r
ge-recursive:
s
eparate out xdl_m
e
rge() int
e
rface
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
J
unio
C Hamano
Allow
mo
r
e than true/false
t
o attributes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Make
sure q
u
ick
f
etch
is no
t
foo
l
e
d
with
a
p
revious
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
J
u
ni
o
C H
a
mano
Me
r
ge
b
ranch 'js/w
r
ap-log'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
send-email: do no
t
leave an e
m
pty CC: line if no cc
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Junio C
H
am
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-15
Juni
o
C Ham
a
n
o
Change
a
ttribute negation ma
r
ker
f
rom '!' to '
-
'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Juni
o
C Hamano
Define a
built-in
a
ttr
i
bute macro "binary"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o C Hamano
attribute ma
c
r
o support
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o C Hamano
Mak
e
fi
l
e: add p
a
t
c
h-ids
.
h back
i
n
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio C Ha
m
ano
F
i
x 'diff' attribute semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Haman
o
F
i
x
'crlf' attribute sem
a
ntics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o
C Haman
o
Me
r
ge g
i
t
://git2
.
kernel
.
org/pub/scm/gitk/gitk into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Teach 'diff' about 'diff' attrib
u
te
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Jun
i
o C Ham
a
no
Define 'crlf' attribute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
i
o
C Hamano
A
d
d basic
infras
t
ructur
e
to a
s
sign attri
b
utes
to pat
h
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
J
u
nio
C Hamano
Me
r
ge
branch '
m
a
i
nt'
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Repla
c
e a
pair
o
f patches w
i
th upda
t
e
d ones fo
r
s
u
b
project
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C
H
a
m
ano
Do not d
e
f
a
u
lt to -
-
no-index when
gi
v
e
n
two direc
t
ories
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Jun
i
o C Hamano
M
erge branc
h
'jc/cherry'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Haman
o
Mer
g
e branch
'
mai
n
t
'
commit
|
commitdiff
|
tree
2007-04-13
Junio
C
Hamano
Fix
g
it {log,show,
.
.
.
} --pretty=email
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
unio C H
a
mano
Documentat
i
on: --ch
e
r
r
y-pick
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
J
u
nio
C
Hamano
git-log
-
-cherry-
p
ick
A
.
.
.
B
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Ha
m
a
n
o
Refa
c
to
r
p
a
t
ch-
i
d filtering out of
g
i
t
-cherry and git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Add %m to '--pre
t
ty=format:'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next