repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Apply mailmap in git-blame output.
2007-04-29
Junio C
Hamano
A
p
ply
mailma
p
in
git-blame o
u
tp
u
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-29
Ju
n
io C Hamano
S
plit out
m
a
i
lmap handling ou
t
o
f shortlog
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-29
Junio C
Ha
m
ano
b
lame -s: sup
p
ress author name and time
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-29
Junio C Ha
m
an
o
Me
r
ge commit
'
gfi/maste
r
'
commit
|
commitdiff
|
tree
2007-04-29
J
u
nio
C
Hamano
Merge
b
r
an
c
h 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-29
Jun
i
o C Hamano
Fix import-tars fix
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-29
Junio C
Hamano
Updat
e
.
mailmap with "
M
ichael"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-29
Junio C Hama
n
o
Do not
ba
r
f on
t
oo long acti
o
n
descrip
t
ion
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-29
Jun
i
o C Hamano
M
erge
b
r
a
nch 'maint' o
f
git://r
e
po
.
or
.
cz/git
/
fastimport
.
.
.
commit
|
commitdiff
|
tree
2007-04-27
Junio C H
a
man
o
Merge br
a
nch
'maint'
commit
|
commitdiff
|
tree
2007-04-26
Junio C Hamano
M
erge br
a
nch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-26
Junio C Hamano
Star
t
prep
a
ring for 1
.
5
.
1
.
3
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-26
Juni
o
C Hamano
Add
-
-da
t
e
=
{lo
c
al,relat
i
ve
,
d
e
fault
}
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-25
Ju
n
i
o C Ham
a
n
o
Merge branc
h
'
j
c
/the-inde
x
'
commit
|
commitdiff
|
tree
2007-04-25
Junio
C
H
a
mano
M
erge branch 'mk/diff'
commit
|
commitdiff
|
tree
2007-04-25
Junio C
H
amano
Merge
b
r
a
nch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-25
J
u
nio C Hamano
Me
r
ge branch
'
ma
s
ter' of git://repo
.
o
r
.
cz/git/fastimport
commit
|
commitdiff
|
tree
2007-04-24
Junio C Ham
a
no
a
p
p
lymbox &
q
u
iltimport: typofix
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
J
u
nio
C
H
a
m
ano
gi
t
attributes documentatio
n
:
clarify overriding
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
Jun
i
o C Hamano
t/
t
est-lib
.
sh: Protect ourselves from c
o
mmon m
i
sc
o
n
fi
g
uration
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
Diff
b
etween
t
wo blobs
s
ho
u
ld
take mode c
h
an
g
es i
n
to
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
Jun
i
o
C Hamano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-24
Ju
n
io C Hamano
Build RPM with ETC_GI
T
CONFIG=
/
e
t
c
/
gitconfig
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
J
u
nio C Ham
a
no
t6030: grab commi
t
object
name as we go
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-24
J
unio C
Hamano
t
53
0
2: a
v
oid
using tail
-
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Jun
i
o
C
Hamano
Document "di
f
f=driver"
a
t
t
ribut
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Juni
o
C
Hama
n
o
Make read-cache
.
c "the_index" free
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Ju
n
io
C Haman
o
Move index-related variables into a stru
c
ture
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Junio C
H
ama
n
o
Suppo
r
t 'd
i
f
f=pgm'
at
t
ribute
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Ha
m
ano
pack-o
b
je
c
ts: m
a
ke
g
e
n
e
r
a
ted packfi
l
e read-only
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-23
Ju
n
io C Hamano
Upda
t
e
tes
t
s not to assume that
generated
packfiles
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C H
a
mano
F
ix 'qui
c
kfix' on pack-
o
b
j
ects
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
pack-objects: quic
k
fix f
o
r permission modes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
io C Hamano
Updat
e
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
Doc
u
m
e
ntation/Makefile: fix section (5) i
n
stallation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-22
Junio
C Hamano
Up
d
ate 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 branc
h
'
lt/obja
l
loc'
commit
|
commitdiff
|
tree
2007-04-22
Junio C
H
amano
Merge br
a
nc
h
'
j
c/add'
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C
Hamano
M
erge br
a
nch 'jc/attr'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Mer
g
e branch 'lt/gitlink'
commit
|
commitdiff
|
tree
2007-04-22
Junio C H
a
m
an
o
Merge bran
c
h 'np
/
p
a
ck'
commit
|
commitdiff
|
tree
2007-04-22
Jun
i
o C Hama
n
o
Merge branch 'jp/refs'
commit
|
commitdiff
|
tree
2007-04-22
Junio C
Hamano
Me
r
g
e branc
h
'jc/quickfetch'
commit
|
commitdiff
|
tree
2007-04-22
Jun
i
o C Hamano
Merge bran
c
h 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-21
J
uni
o
C Hamano
GIT 1
.
5
.
1
.
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
J
u
nio C Hamano
lockfile: record the
pri
m
ar
y
process
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Hamano
co
n
ve
r
t
.
c: r
e
structure the att
r
ibut
e
checking part
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
J
unio C Hamano
Fix bogus linked-list management for
user defined merg
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-21
Ju
n
io
C Ha
m
a
n
o
git-clo
n
e: fix du
m
b protocol trans
p
ort to
clon
e
from
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
Jun
i
o C Hamano
git-add
-
u: matc
h
t
he index wi
t
h
working tre
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
J
u
nio C Ha
m
ano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Docum
e
nt gitattribut
e
s
(
5
)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
J
u
n
io C H
a
mano
Update 'crlf' attri
b
ute semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-20
J
u
nio C Hamano
Documenta
t
ion: su
p
port
manual section (5)
-
file form
a
ts
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio
C
Hamano
Mer
g
e branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
Simplify
code to find
recu
r
sive m
e
r
g
e driver
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-19
Junio
C
Ham
a
n
o
Coun
t
o-fix in merge-
r
ecursiv
e
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C Haman
o
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
J
unio C Hamano
Fix funny types used
i
n
a
ttribute value representation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Allow low-
l
evel driver to specify diffe
r
ent behaviour
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
H
amano
Custom low-level
merge dr
i
ver: chang
e
t
h
e
configura
t
ion
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C H
a
m
ano
Allow the
d
ef
a
ult low-l
e
vel merge drive
r
to be configured
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
C
u
s
tom l
o
w-level
m
erge driver support
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Mer
g
e branch 'fl/
c
vs
s
e
r
ver'
commit
|
commitdiff
|
tree
2007-04-18
Junio C
Ha
m
ano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Hamano
U
pdate draft release
n
otes for
1
.
5
.
2 with accumulated
.
.
.
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 Hamano
Start prepar
i
ng for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
J
unio C Hamano
Merge branc
h
'mas
t
er' of git://repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hama
n
o
Me
r
ge bra
n
ch 'maint' of git
:
//
r
epo
.
or
.
cz/g
i
t-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Junio
C
Hamano
Merge branch 'jc/rea
d
-tree-df'
commit
|
commitdiff
|
tree
2007-04-17
Junio
C H
a
mano
Add a demonstration/
t
est of
c
us
t
om
i
zed merge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ham
a
no
Allow
s
pecifying s
p
e
cialized m
e
rg
e
-b
a
c
kend
per pat
h
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ham
a
no
g
it-gui: Honor TCLTK_PATH if supplied
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C
H
a
mano
me
r
ge-r
e
cursive: separa
t
e out
x
dl_merge() interface
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Jun
i
o C Hamano
Allow mor
e
than
t
rue/
f
a
lse to attributes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-17
Junio
C
Hamano
Mak
e
sure quick
f
etch is not fooled
with a pr
e
vious
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
Junio C H
a
ma
n
o
M
e
rge branch '
j
s/wrap-
l
og'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
s
end-email: do not leave an empty CC: line if no
c
c
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-16
J
unio C Hamano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Ha
m
ano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-15
Juni
o
C Hamano
Change
a
tt
r
i
bute negatio
n
ma
r
ker from
'
!
'
to '
-
'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio C Hama
n
o
D
e
fine a bu
i
lt-in att
r
ibute
m
ac
r
o "binary"
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
unio C Hamano
attr
i
bu
t
e macro
support
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
J
u
ni
o
C
Ha
m
an
o
M
a
kefil
e
: add patch-ids
.
h back in
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C
Hamano
Fix
'di
f
f' attribute
semantics
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Ju
n
io
C
H
a
man
o
F
ix '
c
r
l
f' attribute se
m
ant
i
cs
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-15
Junio C H
a
man
o
Merge git://g
i
t2
.
ke
r
n
e
l
.
org/pu
b
/scm/
g
i
t
k
/g
i
tk in
t
o
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
J
u
nio C Hamano
Teach 'di
f
f
' about 'diff' attribute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
Junio
C
H
ama
n
o
Defi
n
e 'crlf' att
r
ibute
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
J
unio C H
a
ma
n
o
Add bas
i
c in
f
rast
r
ucture
t
o
assign
a
t
tri
b
utes to
p
aths
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-14
J
u
nio C Hamano
Merge branc
h
'
m
aint'
commit
|
commitdiff
|
tree
2007-04-14
Juni
o
C
Hamano
Replace a
pair
of pat
c
h
e
s with update
d
ones for subproject
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
J
u
n
io C H
a
man
o
Do not defa
u
lt to --
n
o-inde
x
wh
e
n given two directories
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-13
Junio C Ha
m
ano
M
e
r
ge
b
r
a
n
c
h 'j
c
/ch
e
rry'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-13
J
uni
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 Ha
m
ano
Documentation:
-
-cherry-pick
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hama
n
o
g
it-log --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
Re
f
actor
p
a
tc
h
-id filtering
o
ut
o
f
g
it-cherry a
n
d git
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next