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
Fix twoway_merge that passed d/f conflict marker to merged_entry().
2007-04-04
Junio C H
a
mano
F
i
x twoway_merge that passed d/
f
confl
i
ct marker to
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Ha
m
ano
Fix read-tr
e
e --prefix=dir/
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Hamano
unpack-trees
:
ge
t
rid of *indpos parame
t
er
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C H
a
mano
u
npack_trees
.
c: pass unpack_tree
s
_options
s
tructur
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Haman
o
add_ca
c
he_en
t
ry():
re
m
ova
l
of file foo
d
oes not conflict
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge branch 'jc/bisect'
commit
|
commitdiff
|
tree
2007-04-04
J
unio
C
Hamano
M
e
rge bra
n
ch '
f
l/doc
'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ha
m
ano
M
e
r
ge branch
'
pos
t
1
.
5
.
1
/
b
l
a
me
.
el'
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Hamano
Merge branch 'post1
.
5
.
1
/tc
l
tk'
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C
Haman
o
Merge
b
r
anch 'p
o
st1
.
5
.
1/
p
4
'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge branch
'
lt/d
i
r
w
alk'
commit
|
commitdiff
|
tree
2007-04-04
Junio
C Haman
o
G
IT 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C Hamano
M
e
rge 1
.
5
.
0
.
7 in
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio
C
H
ama
n
o
GIT 1
.
5
.
0
.
7
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Hamano
rerere should
n
ot
rep
e
at th
e
earlier h
u
nks in la
t
er
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-02
Junio C Hamano
Hopef
u
lly final update to t
h
e
draft Re
l
ease Notes,
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
Junio C Hamano
Opti
o
nal Tck/T
k
: ignore generate
d
files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C
Hamano
Do not bot
h
er documenting fetch--
t
ool
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Haman
o
U
pdat
e
draft release
notes for
1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio
C
Hamano
M
erge branc
h
'
ma
i
nt'
commit
|
commitdiff
|
tree
2007-03-30
Junio C Haman
o
M
erge branc
h
'master'
o
f git
:
//repo
.
or
.
cz
/
git/m
e
rge
t
o
o
l
.
g
i
t
commit
|
commitdiff
|
tree
2007-03-28
J
unio C
Hamano
Documen
t
ation: unbreak user-manual
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C H
a
mano
GI
T
1
.
5
.
1-rc3
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
Updat
e
mai
n
git
.
html
page
t
o
point
at 1
.
5
.
0
.
6
d
ocum
e
n
t
ation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C
H
amano
Merge branc
h
'
maint' to synchronize w
i
th
1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio
C Hama
n
o
GI
T
1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
Fix "--
p
retty=format:" for pare
n
t related items
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hama
n
o
g
it-commit:
"
read-tree -m HEAD" is no
t
the right way
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Jun
i
o C Hamano
s
ha
1
_f
i
le
.
c (write_s
h
a1
_
fi
l
e)
:
Dete
c
t close f
a
ilu
r
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Jun
i
o
C Hamano
Doc
u
ment git-log --fi
r
s
t
-parent
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Junio C Hamano
GIT 1
.
5
.
1-r
c
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Junio
C
Hamano
Merge b
r
a
nch 'jc/fpl'
commit
|
commitdiff
|
tree
2007-03-26
Juni
o
C
Hamano
U
p
d
ate README to p
o
int at a f
e
w key
periodica
l
me
s
sages
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
Junio C
H
amano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-03-25
Junio C Haman
o
Merge
b
ra
n
ch 'maint'
o
f
g
it://linux-nfs
.
org/~
b
fi
e
l
ds
.
.
.
commit
|
commitdiff
|
tree
2007-03-25
Junio
C
Haman
o
M
erge branch 'js/remote-show-push'
commit
|
commitdiff
|
tree
2007-03-25
J
unio C Hamano
Merg
e
branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-03-24
Junio C H
a
mano
g
i
t-a
m
documentation
:
describe
what is taken f
r
om where
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Junio C
Hamano
make the previous optimization wor
k
a
ls
o
on
p
a
t
h-
l
imited
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Junio C Ha
m
ano
rev-l
i
st --bisect:
F
i
x "halfway" optimizat
i
on
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Junio C Hamano
Merge branch 'mast
e
r
'
into j
c
/
bisect
commit
|
commitdiff
|
tree
2007-03-24
Junio C Hamano
Me
r
ge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-03-24
Junio
C
Hamano
Fix
p
ath-limited
"
rev-l
i
st
--bisect
"
t
ermination condition
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Junio C H
a
mano
git-bi
s
e
ct
.
sh: prope
r
ly
dq $GIT_D
I
R
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Junio C
H
amano
g
i
t-
b
isect: typofi
x
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Junio C Hamano
chec
k
ou
t
: report wh
e
re the new HEAD
i
s u
p
on
d
eta
c
hing
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Ju
n
io C Haman
o
t6004
:
add a bi
t
more path
o
ptimization te
s
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Junio C Hamano
git-apply: Do
n
o
t free the
wrong buff
e
r whe
n
we conve
r
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio C H
a
mano
Me
r
ge git://g
i
t2
.
k
e
rnel
.
org/pub/
s
cm/gitk/gitk
commit
|
commitdiff
|
tree
2007-03-22
J
u
n
io C Hamano
Me
r
ge branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-03-22
Junio C Hama
n
o
git-rebase: make
'reb
a
se HEAD bran
c
h
' work
a
s
e
xpected
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio C Hamano
git-rev
-
list --b
i
sect: optimization
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
J
u
nio C Hamano
git-re
v
-li
s
t:
a
d
d --bi
s
ect-vars op
t
i
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Juni
o
C
Ham
a
n
o
t6
0
02
:
minor spelling fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
J
unio C Haman
o
tree_entry_
i
nter
e
sting(): al
l
o
w it to say
"e
v
erything
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
J
unio C
Hamano
tr
e
e-diff: avoid str
n
cmp()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
J
unio C Hamano
Teach tree_entr
y
_int
e
resting()
that the t
r
ee en
t
ries
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-21
Junio C Hamano
blame: cmp
_
s
uspect is no
t
"cmp" anymore
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-20
Junio
C Ham
a
no
Merge git:
/
/git
2
.
kernel
.
org/
p
ub/sc
m
/gitk/git
k
commit
|
commitdiff
|
tree
2007-03-20
Jun
i
o C
H
amano
blame:
micro
-
optimize cmp
_
s
u
s
p
ect()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-19
Junio C Hamano
GIT 1
.
5
.
1-rc1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-19
Junio C Ha
m
ano
Fix
m
erge-index
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-19
Jun
i
o
C Hamano
Merg
e
branch
'
jb/gc'
commit
|
commitdiff
|
tree
2007-03-19
Junio C Hamano
Merge branch
'fl/
c
vs
s
e
r
ve
r
'
commit
|
commitdiff
|
tree
2007-03-19
Junio C Ham
a
no
Merg
e
branch 'sp
/
run-c
o
mmand'
commit
|
commitdiff
|
tree
2007-03-18
Junio C Hamano
U
p
date
main g
i
t
.
html
page to point at 1
.
5
.
0
.
5 doc
u
m
entation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-18
Junio C Hamano
Merge branch
'ar
/
diff'
commit
|
commitdiff
|
tree
2007-03-18
Juni
o
C
Ha
m
ano
Merge
1
.
5
.
0
.
5
i
n from 'maint'
commit
|
commitdiff
|
tree
2007-03-18
Junio
C Hama
n
o
GIT 1
.
5
.
0
.
5
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-17
J
unio
C
Hamano
Merge br
a
nch
'
m
aint'
commit
|
commitdiff
|
tree
2007-03-17
Ju
n
io C Hama
n
o
applym
b
o
x: brown
p
a
p
e
r
bag
f
ix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Junio
C Ha
m
ano
g
it-log --first-pare
n
t
: show o
n
ly the firs
t
par
e
nt log
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Junio
C
Hamano
try-to-si
m
plify
-
commit:
use dif
f
-
tre
e
--qu
i
et m
a
chi
n
ery
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Juni
o
C
Hamano
r
e
visio
n
.
c: explain
what
tree_differen
c
e does
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Junio C Hamano
Teach --quiet to diff backends
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
J
unio C Hamano
diff --qui
e
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Junio C Hamano
Remove unused diffcore_std_no_reso
l
ve
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
J
uni
o
C Haman
o
Merge G
I
T 1
.
5
.
0
.
4
commit
|
commitdiff
|
tree
2007-03-14
J
unio
C Hamano
GIT 1
.
5
.
0
.
4
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
J
unio C
Hamano
git-ch
e
cko
u
t: fix "eva
l
" used for
m
erge labe
l
ling
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Junio C
Hamano
Merge
b
r
an
c
h '
j
c/re
p
ack'
commit
|
commitdiff
|
tree
2007-03-14
J
un
i
o C Hamano
Mer
g
e branch 'jc/fet
c
h
'
commit
|
commitdiff
|
tree
2007-03-14
Junio C Hamano
Merge branch 'dz/maili
n
fo'
commit
|
commitdiff
|
tree
2007-03-14
Ju
n
io
C Hamano
Mer
g
e
b
ranch 'jb
/
p
e
r-user-e
x
c
l
ude'
commit
|
commitdiff
|
tree
2007-03-14
J
u
n
io C
Hamano
M
e
r
g
e branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-03-14
Junio C Hamano
Merge br
a
nch 'p
b
/b
r
anch-track'
commit
|
commitdiff
|
tree
2007-03-14
Ju
n
io
C
Hama
n
o
shortlog: promp
t
when readin
g
fro
m
ter
m
inal
b
y
mist
a
k
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Junio C Hamano
Documenta
t
ion: add git-merg
e
tool to the command lis
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
J
unio C Hamano
Merge br
a
nch 'master' of git
:
//repo
.
or
.
cz/git/mergetool
commit
|
commitdiff
|
tree
2007-03-13
Junio C Hamano
Merge branch 'master' of git://re
p
o
.
or
.
cz
/
git-gui
commit
|
commitdiff
|
tree
2007-03-13
Ju
n
i
o C
Hamano
Merge
b
r
a
n
ch
'
maint'
commit
|
commitdiff
|
tree
2007-03-13
Junio C
H
amano
Merge branch 'mas
t
e
r
' of git
:
//r
e
po
.
or
.
c
z
/git/fasti
m
port
commit
|
commitdiff
|
tree
2007-03-13
Junio C Haman
o
M
e
r
g
e branch 'maint'
of
git://repo
.
o
r
.
cz/git/fastimport
.
.
.
commit
|
commitdiff
|
tree
2007-03-12
Junio C Hamano
Mer
g
e
branc
h
'ma
i
nt' of
git://repo
.
o
r
.
cz/git
-
g
ui in
t
o
.
.
.
commit
|
commitdiff
|
tree
2007-03-12
Junio
C
Hamano
Merg
e
branch '
m
a
int'
commit
|
commitdiff
|
tree
2007-03-12
Junio C Hamano
Merge branch
'jc/bound
a
ry
'
commit
|
commitdiff
|
tree
2007-03-11
Junio
C
Hamano
p
r
epare
_
pa
c
ked_git(): sort pa
c
ks by age
and localne
s
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-11
Jun
i
o C Hama
n
o
F
ix broken create_bran
c
h() in bu
i
ltin-branch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-11
J
unio C Hamano
Merge b
r
anch 'js/at
t
ach'
commit
|
commitdiff
|
tree
2007-03-11
Junio C Hamano
Merge b
r
anch 'js/diff-ni'
commit
|
commitdiff
|
tree
next