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
Fix twoway_merge that passed d/f conflict marker to merged_entry().
2007-04-04
J
u
ni
o
C Hamano
Fi
x
tw
o
way_mer
g
e that passed
d/f
co
n
flict marker to
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Fix rea
d
-t
r
ee --pref
i
x=dir/
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ha
m
a
n
o
unpa
c
k-t
r
ees: get rid
o
f *i
n
dpos parame
t
er
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io
C
Hamano
u
npack_trees
.
c: pass unp
a
c
k
_
tre
e
s_options stru
c
t
u
re
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
add_
c
ache_entry(): r
e
m
o
va
l
of file fo
o
does
not c
o
nflic
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
H
amano
Merge branch 'jc/bis
e
c
t
'
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Hama
n
o
Merge br
a
nc
h
'fl/doc'
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Hamano
Merge
branch 'po
s
t1
.
5
.
1/bl
a
me
.
el'
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio
C
Ha
m
a
n
o
Merge branch 'post1
.
5
.
1/tclt
k
'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge bra
n
ch
'pos
t
1
.
5
.
1/
p
4'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ham
a
no
Merge
branch 'lt/dirw
a
lk'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
GIT 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C
H
amano
Merge 1
.
5
.
0
.
7 in
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C H
a
mano
GIT 1
.
5
.
0
.
7
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
r
erere
should n
o
t repeat the
earlier hunks in later
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-02
Junio C Hamano
Hopefu
l
ly fin
a
l update to
t
h
e
draft Release
N
otes,
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
Junio
C Hamano
Op
t
io
n
a
l Tck/Tk: ignore g
e
nerate
d
f
i
les
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
D
o
not bother
d
ocumenting fetch--tool
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
Upda
t
e d
r
a
ft rel
e
ase notes
f
or 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio
C Hamano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-03-30
Junio
C
Hamano
Merge
b
ranc
h
'master' o
f
gi
t
://repo
.
or
.
cz/
g
it/mergeto
o
l
.
git
commit
|
commitdiff
|
tree
2007-03-28
Ju
n
io C H
a
mano
Documentation: u
n
break
user-manual
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Jun
i
o C Hamano
GIT 1
.
5
.
1-rc3
commit
|
commitdiff
|
tree
2007-03-28
Junio
C Hamano
Update
main gi
t
.
html
page to
point at 1
.
5
.
0
.
6 documen
t
at
i
on
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio
C Hama
n
o
Mer
g
e branc
h
'ma
i
n
t
'
t
o synchroniz
e
with 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
J
u
n
i
o C Hama
n
o
G
I
T 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C
H
aman
o
Fix "--
p
r
e
tty=
f
or
m
at:" for parent relate
d
items
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C H
a
m
a
no
gi
t
-
commit: "rea
d
-tree -m HEAD" is
n
ot the
ri
g
ht way
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Junio
C Hamano
sha
1
_file
.
c (write_sha1_file
)
: Detect
close failure
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Junio
C
H
a
m
a
n
o
Documen
t
git-log
-
-
f
irst-par
e
nt
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Junio C Hamano
GIT 1
.
5
.
1-rc2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Jun
i
o
C
Ha
m
ano
Merge branch 'jc/fpl'
commit
|
commitdiff
|
tree
2007-03-26
Junio C Ham
a
no
U
pdate README t
o
point
a
t a f
e
w key perio
d
ical messages
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
Ju
n
io C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-03-25
J
unio C Hamano
Merge branch 'maint'
o
f
g
it://linu
x
-nfs
.
org/~bfiel
d
s
.
.
.
commit
|
commitdiff
|
tree
2007-03-25
Junio
C Hamano
Merg
e
b
ranch 'js/remote-s
h
ow-push'
commit
|
commitdiff
|
tree
2007-03-25
Junio C Ha
m
ano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-03-24
J
u
n
i
o C
Hamano
g
it-am documentation: d
e
scribe what is
t
a
ken fro
m
w
here
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
J
unio C Ham
a
no
make
t
he pr
e
vi
o
us
o
ptimization
wor
k
also
on path-limi
t
ed
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Junio
C H
a
ma
n
o
r
e
v-li
s
t --bis
e
c
t
:
Fix "halfway" optimization
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Jun
i
o
C Hamano
Merge bra
n
ch 'master'
i
nto jc/bisect
commit
|
commitdiff
|
tree
2007-03-24
Junio C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-03-24
Junio C
Hamano
Fix path
-
limited "rev-
l
ist
--
b
isect
"
t
e
rmi
n
ati
o
n
co
n
dit
i
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Junio
C
Hamano
git-bisect
.
sh: proper
l
y dq $GIT_DIR
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Junio C
Hamano
git-bisect: ty
p
o
f
i
x
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
J
u
nio C Haman
o
checkout: rep
o
rt wher
e
the new HEAD
is upon detaching
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Junio C Hamano
t6004: add
a bit mor
e
path optimization test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Junio C
H
am
a
n
o
git-apply: Do
not free the wrong buffer when we conve
r
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Ju
n
i
o C
Ha
m
ano
Merge git:/
/
gi
t
2
.
kernel
.
org/pu
b
/
s
cm/gitk/gitk
commit
|
commitdiff
|
tree
2007-03-22
Junio C Hamano
Merg
e
branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-03-22
Junio
C Hamano
git-rebase:
make
'rebase HEA
D
br
a
nch' wor
k
as expec
t
ed
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio C
H
amano
git-r
e
v
-
l
i
st -
-
bisect:
optimization
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Jun
i
o C Haman
o
git-rev-li
s
t
: add --bi
s
e
ct-vars opti
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio C H
a
m
a
no
t
6
002
:
minor
s
p
e
lling fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio C Haman
o
t
r
ee_entry_i
n
t
e
re
s
ting
(
): allow it
t
o say "
e
verything
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio C Hamano
tree-diff:
avoid strncmp()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio
C
Hamano
Teach tree_entry_inte
r
es
t
ing
(
) that the
tre
e
entries
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-21
Junio C Hamano
bla
m
e: cmp
_
suspe
c
t is not
"
cmp
"
anymore
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-20
J
u
ni
o
C
H
a
mano
M
erge git://git
2
.
kernel
.
org
/
pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2007-03-20
Ju
n
io C Hamano
blame: m
i
c
r
o
-opt
i
mize cmp_suspect()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-19
Ju
n
io C
H
a
m
a
no
GIT 1
.
5
.
1
-rc1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-19
Juni
o
C Ha
m
ano
Fix
mer
g
e-index
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-19
Juni
o
C Hamano
Merge br
a
n
c
h 'jb/gc
'
commit
|
commitdiff
|
tree
2007-03-19
Junio C Ham
a
n
o
Merge branch '
f
l/cvsserver'
commit
|
commitdiff
|
tree
2007-03-19
Juni
o
C Hamano
Merg
e
branch 'sp/run-command'
commit
|
commitdiff
|
tree
2007-03-18
Junio C Hamano
U
p
d
ate m
a
in git
.
html pag
e
to point a
t
1
.
5
.
0
.
5 do
c
umentation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-18
Junio
C
H
amano
Merge
branch 'ar/diff'
commit
|
commitdiff
|
tree
2007-03-18
Junio C Ha
m
ano
Merge 1
.
5
.
0
.
5 in from 'm
a
int'
commit
|
commitdiff
|
tree
2007-03-18
Juni
o
C
Ham
a
no
G
IT 1
.
5
.
0
.
5
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-17
Junio C
H
ama
n
o
M
e
r
ge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-03-17
J
unio C
H
a
mano
applymbox: brown pap
e
r bag
fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
J
unio C Ha
m
an
o
git-log --fi
r
st-parent:
s
h
o
w onl
y
t
h
e first parent log
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Junio C Ha
m
ano
try-to-simplify-co
m
mit: us
e
diff-tre
e
--
q
uiet
machinery
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Junio C Hamano
revisi
o
n
.
c: e
x
plain what tree_difference does
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Junio C Hamano
T
e
ach
-
-
q
uiet to d
i
ff
backe
n
ds
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Junio C Ham
a
no
diff --quie
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Junio C Hamano
Remove u
n
used
d
i
ffcore_std_no_res
o
lve
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Ju
n
io C Hamano
Merge GIT 1
.
5
.
0
.
4
commit
|
commitdiff
|
tree
2007-03-14
J
u
nio C Hamano
GIT 1
.
5
.
0
.
4
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Junio
C Hamano
git-check
o
ut: fi
x
"eval"
used for
m
erge
labell
i
n
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Junio C Hamano
Merge
br
a
n
ch 'jc/repack'
commit
|
commitdiff
|
tree
2007-03-14
Junio C
Hamano
Merg
e
b
r
a
n
ch
'
j
c/fetch'
commit
|
commitdiff
|
tree
2007-03-14
Junio C Hamano
M
e
rge
bran
c
h 'd
z
/maili
n
fo
'
commit
|
commitdiff
|
tree
2007-03-14
Junio C Hamano
Merge branch 'jb
/
per-user-e
x
clude'
commit
|
commitdiff
|
tree
2007-03-14
Junio C
H
a
m
a
no
M
erge branch '
m
aint
'
commit
|
commitdiff
|
tree
2007-03-14
J
unio C Hamano
Me
r
g
e
branch 'pb/br
a
n
ch
-
track'
commit
|
commitdiff
|
tree
2007-03-14
Junio C H
a
ma
n
o
shortl
o
g
: promp
t
wh
e
n
r
eading from
terminal by mistake
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Junio C Ham
a
no
Docume
n
tation: ad
d
git-mergetool to th
e
command list
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
J
u
nio C Hamano
Merge branch 'mast
e
r' o
f
git://repo
.
or
.
cz/git/mergetool
commit
|
commitdiff
|
tree
2007-03-13
J
unio
C
H
a
mano
Merg
e
branch 'ma
s
ter' of git:/
/
repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2007-03-13
Jun
i
o C Hamano
Merge branc
h
'
m
aint'
commit
|
commitdiff
|
tree
2007-03-13
Ju
n
io C
Hamano
Merge branc
h
'ma
s
ter' of git
:
/
/
rep
o
.
or
.
cz/git/fa
s
tim
p
or
t
commit
|
commitdiff
|
tree
2007-03-13
Junio C Hamano
Merge b
r
a
n
ch 'maint'
of git://
r
epo
.
or
.
cz/git/
f
astimport
.
.
.
commit
|
commitdiff
|
tree
2007-03-12
Junio C Haman
o
M
er
g
e branch 'maint
'
of git
:
//re
p
o
.
or
.
cz/git-gui int
o
.
.
.
commit
|
commitdiff
|
tree
2007-03-12
Junio C H
a
mano
Merg
e
br
a
nc
h
'm
a
int'
commit
|
commitdiff
|
tree
2007-03-12
Junio C Hamano
M
e
r
ge branch 'jc/boundary'
commit
|
commitdiff
|
tree
2007-03-11
Junio C Ha
m
ano
prepare_packed_git(
)
: sort pack
s
by
a
g
e
and localness
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-11
Junio C Hamano
Fix broken
c
r
e
ate_branch() in builtin-branch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-11
Junio
C
Hamano
M
e
rge bra
n
ch 'js/attach'
commit
|
commitdiff
|
tree
2007-03-11
J
u
nio C Hamano
Me
r
ge branc
h
'js/diff-
n
i
'
commit
|
commitdiff
|
tree
next