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
Merge branch 'lt/objalloc'
2007-04-22
Junio
C Hamano
Me
r
ge branch
'lt/o
b
j
a
l
l
o
c
'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hamano
Merg
e
branc
h
'jc/add'
commit
|
commitdiff
|
tree
2007-04-22
J
u
nio C Ham
a
no
Merge bra
n
ch 'j
c
/attr
'
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
io C Ha
m
a
no
Merge bra
n
ch 'l
t
/
g
it
l
i
n
k
'
commit
|
commitdiff
|
tree
2007-04-22
Junio C Hama
n
o
M
e
rge branch 'np/pack'
commit
|
commitdiff
|
tree
2007-04-22
Junio C
H
a
mano
Merge branc
h
'
j
p
/
ref
s
'
commit
|
commitdiff
|
tree
2007-04-22
Ju
n
io C Hamano
Merge b
r
anch 'jc/quickfetch'
commit
|
commitdiff
|
tree
2007-04-22
Juni
o
C H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-21
Juni
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
Ha
m
a
no
l
o
ckfile: record the
p
r
imary
process
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio
C
H
a
mano
convert
.
c:
re
s
truct
u
re the att
r
ibute checking par
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
J
u
ni
o
C
Ha
m
ano
Fix bogus linked-list management for user
d
e
f
i
ned
merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-21
Junio C Haman
o
git-clo
n
e: fix dumb protocol t
r
ansport to clo
n
e from
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
J
u
nio C Hamano
g
it-a
d
d -u: match the index with w
o
rking tree
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
J
unio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-20
Junio
C Ham
a
no
Do
c
u
ment gitattrib
u
te
s
(5)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio
C Ha
m
ano
Update
'
crlf' attribute semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-20
Junio
C
Hamano
Doc
u
mentation: su
p
p
o
r
t
manua
l
s
ection (5) - file
f
ormats
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio
C
Haman
o
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-19
Junio
C Hamano
Simplify cod
e
to f
i
nd recursive me
r
ge driver
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-19
Junio C Hamano
Counto-f
i
x in merge-recursive
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Ju
n
i
o
C
H
amano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
Junio C Hama
n
o
Fix funny
t
ypes
used in attribut
e
value repre
s
entat
i
on
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C H
a
ma
n
o
Allow low-level d
r
iver to
specif
y
differe
n
t behavi
o
ur
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Ha
m
ano
Custom low-l
e
vel me
r
ge d
r
i
ve
r
:
change
t
he config
u
r
a
tion
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Haman
o
Allow the default low-level merge
d
river to be configured
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
J
u
n
io C
Hamano
Custom low-level merge d
r
iver support
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o
C Hama
n
o
Merge branch 'fl/cvsserver'
commit
|
commitdiff
|
tree
2007-04-18
Juni
o
C
Haman
o
Merge b
r
anch
'ma
i
nt
'
commit
|
commitdiff
|
tree
2007-04-18
Junio
C
Hamano
Update
d
raft r
e
lea
s
e notes for 1
.
5
.
2 w
i
th ac
c
umulated
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ham
a
no
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-18
J
u
nio C
Hamano
Star
t
p
r
e
p
a
r
ing for 1
.
5
.
1
.
2
commit
|
commitdiff
|
tree
2007-04-18
Junio C Ham
a
no
Me
r
ge
b
r
a
nch
'
m
a
ster' o
f
git://repo
.
or
.
cz/git-g
u
i
commit
|
commitdiff
|
tree
2007-04-18
Jun
i
o C Hamano
Merge bra
n
ch 'maint' of git://repo
.
o
r
.
cz/git-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-04-17
Junio C
Hamano
Merge branch 'jc
/
read-tre
e
-df'
commit
|
commitdiff
|
tree
2007-04-17
Junio
C
H
a
m
ano
Add a
d
e
m
onstration/test of customiz
e
d merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Allo
w
specifyi
n
g specia
l
ized merge-ba
c
kend
p
er p
a
t
h
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Jun
i
o C Hamano
git-gui: Honor TCLTK_PATH
if supplied
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hama
n
o
merge-r
e
curs
i
ve:
separate out
xdl_
m
erge()
inte
r
fac
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
J
unio C H
a
m
ano
Allow more t
h
an true/
f
alse t
o
attributes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-17
Junio C Hamano
Make sure quickf
e
tch is not
foo
l
ed with a previous
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Junio C Ham
a
no
Merge b
r
anch 'js/wrap-log'
commit
|
commitdiff
|
tree
2007-04-16
J
u
nio C Hamano
se
n
d
-email: do
not leave an empt
y
CC
:
line if no cc
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-16
Junio C
Hamano
Me
r
g
e
b
r
anch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-16
Junio C H
a
m
an
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-15
Junio C H
a
m
ano
Change
a
ttribute neg
a
ti
o
n mar
k
e
r fro
m
'!' to
'-'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio C Hamano
Defi
n
e a bu
i
l
t-in attribute macro "binary
"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Juni
o
C
H
amano
a
t
tribute macro support
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Jun
i
o C Hamano
M
a
kefile: 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 Hamano
F
i
x
'
diff'
attri
b
ute semantics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Junio
C
Ha
m
a
no
F
i
x 'crlf'
a
t
tribute sema
n
tics
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-15
Juni
o
C Hamano
M
erg
e
git://git2
.
kernel
.
org/pub/scm/g
i
tk/gitk into
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
Tea
c
h 'dif
f
' about 'diff' attri
b
ute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C H
a
mano
D
e
fin
e
'crlf' attribute
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
Junio C Hamano
A
d
d basic i
n
frastructur
e
t
o assign attribut
e
s to pat
h
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-14
J
unio C Hamano
Merge
b
r
anc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-14
Junio C
H
aman
o
Re
p
lace
a pair of patch
e
s with updated ones for subpr
o
jec
t
.
.
.
commit
|
commitdiff
|
tree
2007-04-14
Junio C Ham
a
no
D
o
not default to --no-i
n
d
e
x w
h
en giv
e
n two directories
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-13
Jun
i
o
C
Hama
n
o
M
e
rge br
a
nch 'jc
/
cherry'
commit
|
commitdiff
|
tree
2007-04-13
Junio C Hamano
M
e
r
g
e branch 'maint'
commit
|
commitdiff
|
tree
2007-04-13
J
unio C
H
amano
F
ix gi
t
{log,show,
.
.
.
} --pre
t
ty=email
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
J
u
nio
C
Hamano
Doc
u
me
n
tatio
n
: --cher
r
y-p
i
ck
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C
Hamano
git-l
o
g --cherry
-
pi
c
k A
.
.
.
B
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Refactor patch-i
d
filterin
g
out
of git-cherry and g
i
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
Add %
m
t
o '--p
r
etty=for
m
at:'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-12
Jun
i
o C Hamano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2007-04-12
Junio C Hamano
GIT 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-11
Junio
C
Hama
n
o
fsck: d
o
n
ot co
m
plain on
d
e
t
a
c
hed HEAD
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
u
ni
o
C Ha
m
ano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-10
Junio
C Ham
a
n
o
gi
t
-fet
c
h: use fetch--t
o
o
l p
i
ck-
r
ref to avoid local
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
unio C Hamano
g
i
t-fetch--tool pick-rref
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
t3
0
30: merge-recursive backend test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Ha
m
ano
merge-recursive: handl
e
D/F
conflict c
a
se more ca
r
ef
u
ll
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
unio C Ham
a
no
merge-rec
u
r
s
ive: d
o
not barf on "to be removed
"
entries
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io
C
Hamano
Trea
t
D/F conflict entry
m
o
r
e
carefully in unpack-tr
e
e
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Ju
n
io C Ham
a
no
t100
0
: f
i
x case
t
able
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
s
hortlog -w: make wrap-lin
e
behaviour optional
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Ju
n
io C Hamano
Merge bra
n
ch '
j
c
/
push'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merge branch
'jc/merge-su
b
t
r
ee'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Ha
m
a
no
Merge bra
n
ch 'js/f
e
t
ch
-
progress'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Ha
m
a
no
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hama
n
o
Add Documentation/cmd-li
s
t
.
made to
.
gitignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Start 1
.
5
.
2 cycle by
p
repareing RelNotes for it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Jun
i
o C Ha
m
ano
Merg
e
branch 'jc/
r
ead-tree-df' (
e
arly p
a
rt
)
commit
|
commitdiff
|
tree
2007-04-08
Ju
n
io C Haman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-08
Jun
i
o C Hamano
Prep
a
re f
o
r 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
H
a
m
a
no
A
new m
e
rge stragety
'
subtre
e
'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
git-push to multiple loca
t
ions does not stop at the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C Hamano
gi
t
-
p
ush
r
eports t
h
e
URL after fai
l
ing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Haman
o
Merge branch 'jc/index-output'
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Haman
o
Mer
g
e branch 'fp/make-j'
commit
|
commitdiff
|
tree
2007-04-07
Junio C
H
a
m
a
no
Me
r
ge
b
ra
n
ch
'cc/bisect'
commit
|
commitdiff
|
tree
2007-04-07
Junio C
Ha
m
ano
M
e
rg
e
branch 'jc/checkout
'
(early part)
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-07
J
u
n
i
o C H
a
mano
Doc
u
mentation: tighten d
e
pende
n
c
y
for git
.
{html,txt}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
mano
git-bise
c
t: allo
w
bis
e
cting with only one bad comm
i
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
t6030: add a bit more tests to git-bisect
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
J
unio C Hamano
git-bisect:
m
oderniz
a
tion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Ham
a
no
Merge
b
r
anch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-05
Junio
C
Ha
m
ano
Rena
m
e add_fi
l
e_to_i
n
dex() t
o
add_fi
l
e_to_cache()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next