repo.or.cz
/
git
/
dscho.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
Ju
n
io C Hamano
Apply ma
i
l
m
ap in git
-
bl
a
me
o
utp
u
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
J
unio
C Hamano
Split out mailmap handling out of
s
hortl
o
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
J
u
n
io C
Ham
a
no
blam
e
-s: suppress au
t
hor name and time
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
J
u
nio C Hamano
M
e
rge commit 'gfi/
m
a
s
ter'
commit
|
commitdiff
|
tree
2007-04-29
Junio C Hamano
Merge branch
'maint
'
commit
|
commitdiff
|
tree
2007-04-29
Junio C H
a
m
a
no
Fix imp
o
rt-tars fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio C
H
aman
o
U
p
date
.
mailmap with "Michael"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio C Hamano
Do not barf
o
n
t
o
o
long action descrip
t
i
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio C Hamano
Merge branch
'
maint
'
of git:
/
/r
e
p
o
.
or
.
cz/git/fas
t
import
.
.
.
commit
|
commitdiff
|
tree
2007-04-27
J
u
nio C Ham
a
n
o
Merge branc
h
'
maint'
commit
|
commitdiff
|
tree
2007-04-26
Junio
C
Hamano
M
e
rge
b
ranch
'maint'
commit
|
commitdiff
|
tree
2007-04-26
Junio C Hamano
Start preparing
f
or 1
.
5
.
1
.
3
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-26
J
u
ni
o
C Hamano
Add --
d
ate
=
{local,r
e
l
a
tive,defa
u
l
t
}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-25
Junio C Hamano
M
erge b
r
anch 'jc/the-i
n
d
ex'
commit
|
commitdiff
|
tree
2007-04-25
Junio C Hamano
Merge bra
n
c
h '
m
k
/
d
iff
'
commit
|
commitdiff
|
tree
2007-04-25
Ju
n
io C Hamano
Merge b
r
anch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-25
Junio C H
a
mano
Me
r
ge b
r
anch 'master
'
of git://
r
e
po
.
or
.
cz/
g
it/fastimpo
r
t
commit
|
commitdiff
|
tree
2007-04-24
Juni
o
C
H
am
a
no
a
p
plymbox
&
qui
l
t
i
mport:
typofix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
J
u
n
io C Hamano
gita
t
t
rib
u
tes d
o
cument
a
tion:
clarify
o
verridin
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
t/test-lib
.
sh: Prote
c
t ou
r
selves from commo
n
m
isconfi
g
u
r
atio
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Haman
o
Diff
between two blo
b
s
should tak
e
mode chan
g
es
i
nto
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
Buil
d
RP
M
with E
T
C_GITCONFIG=/etc/g
i
t
con
f
ig
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Juni
o
C Haman
o
t6030: grab com
m
it
o
b
ject name as we go
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Juni
o
C Hamano
t530
2
: avoid using tail -c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Juni
o
C Hama
n
o
Document "diff=dr
i
ver" a
t
tri
b
ute
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Juni
o
C Hamano
Ma
k
e read-cache
.
c "
t
he_
i
ndex" free
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C Ham
a
no
M
ove index-related variables into a s
t
ruc
t
ure
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
J
u
n
i
o C H
a
ma
n
o
Support
'
diff=pgm' attribute
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio
C
Hamano
pack-objects
:
make
g
enerated packfile rea
d
-
o
nly
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Juni
o
C Hamano
Up
d
ate
tests not to assume that generated pack
f
iles
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Ham
a
n
o
Fix 'qu
i
ckfi
x
'
on pack-objects
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C Hamano
pack-objects: qui
c
kfix
f
or permission modes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Jun
i
o C Hamano
Up
d
at
e
draft
release notes
f
o
r
v1
.
5
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Documenta
t
i
o
n
/Makefil
e
:
fix
sect
i
on (5)
i
nstallation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
io
C
Ha
m
ano
Update documentation lin
k
s to
p
o
i
nt at
v
1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C
H
a
m
ano
M
erge branch 'lt/objall
o
c'
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
io C Hamano
M
erge
b
ranch
'
jc/add'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hama
n
o
Merge branch
'
j
c
/attr'
commit
|
commitdiff
|
tree
2007-04-22
Junio C
Hamano
Merge branch 'lt/gitlink'
commit
|
commitdiff
|
tree
2007-04-22
Junio C
Ham
a
n
o
Merge bra
n
ch 'np
/
pack'
commit
|
commitdiff
|
tree
2007-04-22
Junio C
Ha
m
a
n
o
M
erge branch 'jp/ref
s
'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Me
r
ge bra
n
c
h
'
j
c/quickfet
c
h
'
commit
|
commitdiff
|
tree
2007-04-22
J
unio C Haman
o
Merge branch
'
maint
'
commit
|
commitdiff
|
tree
2007-04-21
Jun
i
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
a
mano
lockfile: record the pr
i
mary process
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
J
u
nio C Ha
m
ano
convert
.
c
: restr
u
cture
t
he attribute checking par
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
J
u
nio C Hamano
Fix bogus li
n
ked
-
list management for user defi
n
ed merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
J
u
nio C
Hamano
git-clon
e
: fix dumb protocol transpo
r
t
t
o clone from
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio
C
Hamano
git-add -
u
: match
the index wit
h
w
o
rking tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C Ha
m
ano
M
e
rge
b
r
anch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-20
Junio C Ha
m
ano
Docum
e
nt gitattri
b
utes(5)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C H
a
m
an
o
Update 'crlf'
attribute sema
n
t
i
cs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Juni
o
C Ha
m
ano
D
o
c
u
mentat
i
on:
s
u
pport manual
section
(
5
)
-
file format
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
J
u
n
i
o
C
Hamano
Merge
bra
n
ch
'm
a
int'
commit
|
commitdiff
|
tree
2007-04-19
Junio
C Hama
n
o
Simplify code to fi
n
d recursive
merge driver
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio
C Hamano
Counto-fix in
m
erge-recu
r
s
i
ve
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C
Hamano
Fix funny t
y
pe
s
used in att
r
ibute value representation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C
Hamano
Allow low-level
d
riv
e
r to specify dif
f
erent behaviour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ham
a
no
Custom
l
ow-lev
e
l
merge dr
i
ver:
cha
n
g
e
the configuration
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Allow t
h
e default low-leve
l
merge dr
i
ver
to be
c
onf
i
gured
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Custom low-level
merg
e
dr
i
ver
s
u
pport
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge b
r
anch 'fl
/
cvss
e
rver'
commit
|
commitdiff
|
tree
2007-04-18
J
u
n
io
C Haman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
J
u
n
io C
Hamano
Update
draft release notes 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
erge
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
J
u
ni
o
C Hamano
Start preparing for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge branch 'master' of git
:
//repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2007-04-18
J
u
n
io C
H
amano
Merge branch 'm
a
int' of git://repo
.
o
r
.
c
z/git-gui
i
nto
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
J
u
nio C Ham
a
no
Merge branch 'jc/read-tree-df'
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Add a demonstration/t
e
s
t o
f
customized
m
erge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
u
nio C Hamano
Allow specifying s
p
ec
i
alized merge-backend per
p
ath
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
u
n
i
o
C Hamano
git-gui: Honor TCLTK_PATH
i
f supplied
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Ju
n
io
C Haman
o
merge-recursive: separa
t
e out xd
l
_merge() i
n
terfac
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Ha
m
ano
Allow more t
h
an tru
e
/f
a
lse
to attributes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
u
nio C Haman
o
M
ake su
r
e quickfetch i
s
no
t
fooled with a previous
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Junio C H
a
mano
Merge bra
n
ch 'js/
w
rap-log'
commit
|
commitdiff
|
tree
2007-04-16
Ju
n
i
o C Hamano
send-em
a
il:
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
J
unio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-16
Junio C Hamano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-15
J
u
nio C
H
a
mano
C
hang
e
a
ttribute negation mark
e
r
from '!' t
o
'-'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Ham
a
no
Define a bui
l
t
-in attri
b
ute macro
"binary"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
attribute mac
r
o
sup
p
ort
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
J
unio C Hamano
Mak
e
fil
e
: add patch-ids
.
h ba
c
k in
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Ha
m
ano
Fix 'diff' a
t
tr
i
bute
s
em
a
ntics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Juni
o
C Hamano
Fi
x
'crlf
'
attribute
semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C
Ham
a
no
Merge git://git2
.
kernel
.
org/pub/sc
m
/gitk
/
gitk
into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C Ha
m
ano
Teach 'diff' abou
t
'diff
'
attr
i
bute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C
H
a
ma
n
o
D
efine 'crlf' attribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Ju
n
i
o
C Ha
m
a
no
A
d
d basic infrast
r
ucture to assign
attributes to
p
at
h
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio
C
H
a
mano
M
e
rg
e
branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-14
Junio
C
Hamano
Replace a pair of patches with updated ones for
s
ubproject
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Do
not def
a
ult to --no-index when g
i
ven two
directories
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Ju
n
i
o
C Haman
o
Merge branch 'jc/
c
herr
y
'
commit
|
commitdiff
|
tree
2007-04-13
Jun
i
o C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-13
Junio C
H
a
mano
F
i
x
git {lo
g
,show,
.
.
.
} --pretty=email
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
D
ocumentation: --cherry-
p
i
c
k
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
u
n
i
o C Hamano
git-log --cherry-pick A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Refactor pat
c
h-id fi
l
te
r
i
ng out of git
-
ch
e
rry a
n
d g
i
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next