repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'master' of git://repo.or.cz/git-gui
2007-05-07
J
u
nio C
Hama
n
o
Merge
branch 'master' of
git://r
e
p
o
.
o
r
.
cz/g
i
t-gui
commit
|
commitdiff
|
tree
2007-05-07
Junio C Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-05-07
J
unio C Hamano
Merge branch 'maint' of git:
/
/repo
.
or
.
c
z/git-gui
into
.
.
.
commit
|
commitdiff
|
tree
2007-05-07
Junio C
H
amano
Mer
g
e git:
/
/git2
.
kernel
.
org/p
u
b/sc
m
/gi
t
k/gitk into
.
.
.
commit
|
commitdiff
|
tree
2007-05-06
Junio C H
a
mano
GIT v1
.
5
.
2-rc
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-06
J
u
n
i
o C Hamano
Merge
branch
'maint'
commit
|
commitdiff
|
tree
2007-05-06
J
unio C Hamano
Add test for b
l
a
m
e corner cases
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-06
J
u
ni
o
C Hama
n
o
blame:
-
C
-C
-
C
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-06
Junio C
H
amano
bl
a
me: No
t
ic
e
a wholes
a
le
inco
r
poration of an e
x
isting
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-04
Junio C Ha
m
ano
Me
r
g
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-05-04
Junio C Ha
m
ano
di
f
f
.
c: f
i
x
"si
z
e cache
"
handling
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-03
Junio C
H
am
a
no
blame: use
.
mailmap uncon
d
i
t
i
o
nally
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-02
Junio C
H
ama
n
o
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-05-02
J
unio C
Ham
a
no
Merge branch 'mai
n
t' of git:/
/
repo
.
or
.
cz/git/fastimport
.
.
.
commit
|
commitdiff
|
tree
2007-05-01
Junio C H
a
mano
GIT v1
.
5
.
2-rc
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-05-01
Junio
C Hamano
Mer
g
e branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-05-01
Junio C Hamano
GIT v1
.
5
.
1
.
3
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-30
Junio C Ha
m
ano
Fix s
y
mlink ha
n
d
l
ing
in g
i
t
-s
v
n, rela
t
ed to Pe
r
lIO
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
J
unio C Hamano
Merge branch 'jc/attr'
commit
|
commitdiff
|
tree
2007-04-29
Junio C Hamano
Ma
k
e
s
ure te
s
t-genrandom and t
e
s
t
-chmt
i
me are builtas
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Ju
n
io C Hamano
M
ake macros
to prev
e
nt doub
l
e-inclus
i
o
n
in headers
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio C Hamano
Apply
m
a
i
l
map in g
i
t
-bl
a
me o
u
tput
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio C Hamano
Split out m
a
ilmap handling out of
s
hortl
o
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Ju
n
io C Hamano
b
lame -s: su
p
p
r
ess author name
and time
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio
C
Hamano
M
e
rge commit 'gfi/master'
commit
|
commitdiff
|
tree
2007-04-29
Junio C Hamano
M
erge br
a
nch 'm
a
in
t
'
commit
|
commitdiff
|
tree
2007-04-29
Junio C Hamano
Fi
x
impor
t
-tars
f
ix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio C Ham
a
no
Updat
e
.
mailmap with "M
i
chael"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio
C Hama
n
o
Do
n
ot barf on too long acti
o
n
des
c
ri
p
tion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-29
Junio C H
a
mano
Merge branch 'maint' of
g
it:
/
/repo
.
or
.
cz
/
git/fastimport
.
.
.
commit
|
commitdiff
|
tree
2007-04-27
Junio C Haman
o
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-04-26
Junio
C
Hamano
M
e
rge branch
'
maint'
commit
|
commitdiff
|
tree
2007-04-26
Junio C Hamano
St
a
rt
preparing f
o
r 1
.
5
.
1
.
3
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-26
Junio C
Ha
m
ano
Add --date={local,re
l
ati
v
e,def
a
u
l
t
}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-25
Ju
n
io C Haman
o
Add 'fil
t
e
r' attr
i
bute and external filter driver
definit
i
on
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-25
Junio C
Hamano
A
dd 'ident' co
n
v
ersion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-25
Junio C Hamano
Merge branch 'jc/
t
he-index'
commit
|
commitdiff
|
tree
2007-04-25
Jun
i
o C Hamano
Me
r
ge branch 'm
k
/diff'
commit
|
commitdiff
|
tree
2007-04-25
Ju
n
io
C
Hama
n
o
Merge
b
ra
n
ch
'
ma
i
n
t'
commit
|
commitdiff
|
tree
2007-04-25
J
uni
o
C Haman
o
Merge branch 'master' of g
i
t
://repo
.
o
r
.
cz/git/fa
s
t
i
mport
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
applymbox & quiltimport: typofi
x
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio
C
H
am
a
no
gitattributes documen
t
ation: clari
f
y ove
r
r
id
i
ng
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Ju
n
io C
Ham
a
n
o
t/test-
l
ib
.
sh: Pr
o
tect ourselves f
r
om
c
ommon misconfigurat
i
on
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
Diff
b
etween two blobs shoul
d
tak
e
mode
c
hanges into
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Ham
a
no
Me
r
ge
b
ran
c
h
'maint'
commit
|
commitdiff
|
tree
2007-04-24
Junio C Hamano
Build
R
P
M wi
t
h ETC_
G
ITCONFIG=/etc/gitconf
i
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Ham
a
no
t60
3
0
:
g
ra
b
comm
i
t
object
n
ame as we go
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-24
Junio C Ham
a
no
t530
2
: avoid
u
sing ta
i
l -c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C
Hamano
D
ocu
m
ent "
d
i
f
f=driver" a
t
t
ribute
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio
C
Hamano
Make rea
d
-cache
.
c "the_index" free
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
J
uni
o
C
Hamano
Move i
n
dex-related va
r
iable
s
into a stru
c
tu
r
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
J
u
nio C Hamano
Suppo
r
t '
d
iff=pgm' attribute
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
Junio C
Hamano
pack-obj
e
cts
:
make generated packfile
r
ead-on
l
y
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-23
J
u
nio C Hamano
Upd
a
te tes
t
s not to assume that ge
n
era
t
e
d packfiles
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
io C Hamano
Fix 'qui
c
kfix' on pac
k
-objects
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio
C
H
amano
p
ack-ob
j
ects: quickfix
for pe
r
m
issi
o
n mod
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Haman
o
Update
dra
f
t release n
o
te
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
Documentation/Makefile: fix section (5
)
instal
l
a
t
ion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Update d
o
cumenta
t
ion links to point at
v1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-22
J
u
n
i
o
C H
a
mano
M
erge branch 'l
t
/
obja
l
loc'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Haman
o
Merge
b
r
anch
'jc/add'
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
io C
H
ama
n
o
Me
r
ge
branch 'jc/attr'
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C Hamano
Merg
e
branch 'l
t
/gitlink'
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
io C H
a
m
ano
Me
r
ge branch 'np/pack'
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
i
o C Hamano
Merge branch 'jp/re
f
s'
commit
|
commitdiff
|
tree
2007-04-22
J
u
n
io
C H
a
man
o
Merge branch
'
jc/quickf
e
t
c
h'
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C Hamano
Merge bra
n
ch
'maint'
commit
|
commitdiff
|
tree
2007-04-21
J
unio C Haman
o
GIT
1
.
5
.
1
.
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio
C Hamano
lockfile: re
c
ord the pri
m
ary process
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Juni
o
C Hamano
c
o
n
ve
r
t
.
c: restructu
r
e t
h
e attr
i
bute checking part
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
J
u
n
io C Ham
a
no
Fix
b
ogus linked-list
m
anageme
n
t for user defined
m
er
g
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Jun
i
o C H
a
mano
git
-
clone: fix dumb protocol
tra
n
s
p
ort
t
o
clon
e
from
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Jun
i
o C Ham
a
no
git-add
-
u:
m
a
tch
the index with work
i
ng
t
ree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Ju
n
io C
H
amano
Merge br
a
nch 'mai
n
t
'
commit
|
commitdiff
|
tree
2007-04-20
Junio C Hamano
Document gita
t
tr
i
bu
t
es(5)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C
H
amano
Upd
a
t
e 'cr
l
f' attrib
u
t
e
s
emantic
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio C
Hamano
Doc
u
ment
a
t
ion: support ma
n
ual section (5
)
- file
f
o
r
mats
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
Merge
branch
'
maint'
commit
|
commitdiff
|
tree
2007-04-19
Junio C Ham
a
no
Simplify co
d
e to
fin
d
recursive merge driv
e
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Ha
m
ano
C
o
unto-fix in merge-re
c
ursi
v
e
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
F
i
x funny types used
i
n
attribute va
l
ue representation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C H
a
m
ano
A
l
low l
o
w-level
driver to specify
d
ifferent behaviour
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Custom l
o
w
-level merge driv
e
r: change the configuration
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C Hama
n
o
Allow th
e
defaul
t
low-level me
r
g
e driver
t
o be configur
e
d
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ha
m
an
o
Custom low-level merg
e
driver support
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
unio C
H
a
m
a
no
Merge branch 'f
l
/
cv
s
server'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Hamano
Update dra
f
t
re
l
eas
e
no
t
e
s
for 1
.
5
.
2 with
ac
c
um
u
lated
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
io C Hamano
Mer
g
e b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ha
m
an
o
Start
pr
e
pari
n
g for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o
C
Hamano
Merge branch 'm
a
s
t
er
'
of git
:
//rep
o
.
or
.
c
z/git
-
gui
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Ham
a
n
o
Merge br
a
nch
'm
a
int'
of gi
t
://repo
.
or
.
cz/git-
g
ui into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
J
u
nio C Hamano
Merge b
r
anch 'jc/read-tree
-
df'
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Add
a
d
emo
n
s
tration/test of customiz
e
d m
e
rge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C H
a
mano
Allow sp
e
cifyi
n
g specia
l
ized merge-backend per path
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
unio C Ha
m
ano
git-gui: Ho
n
or TCLTK_P
A
TH if supplied
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C H
a
m
a
no
merg
e
-recursive: separate out xdl_merg
e
(
) interface
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Haman
o
Allow more than
tr
u
e/
f
alse to at
t
rib
u
tes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Mak
e
sure
quic
k
fetch is not fooled
w
ith a previous
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next