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
aman
o
Fix t
w
oway_
m
erge that passed d/f confl
i
ct
m
ark
e
r
t
o
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C Hamano
Fi
x
read-tr
e
e -
-
pref
i
x=dir
/
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
unpack-trees: get rid
of *in
d
pos
p
aramet
e
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C H
a
mano
unpack_trees
.
c: pass
u
npack
_
trees_options structu
r
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
a
m
ano
a
d
d
_cache_entry(): r
e
mo
v
al of
f
ile
f
oo does not
c
o
n
flict
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Ha
m
ano
Me
r
ge
b
r
a
nc
h
'jc/
b
i
sect'
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Hama
n
o
Merge branch 'f
l
/doc'
commit
|
commitdiff
|
tree
2007-04-04
J
u
n
i
o
C
Hamano
Merg
e
branch
'
p
o
s
t
1
.
5
.
1/
b
lame
.
e
l
'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
M
e
rge bran
c
h 'p
o
st1
.
5
.
1/tcltk'
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C Hamano
Merge bran
c
h
'
p
ost1
.
5
.
1/p4
'
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Haman
o
M
e
rge
b
ranch 'lt/dirwa
l
k'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ham
a
no
GIT 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge 1
.
5
.
0
.
7 in
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ha
m
ano
G
I
T
1
.
5
.
0
.
7
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Ham
a
no
rerere should not
re
p
ea
t
t
h
e earlier hunks i
n
later
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-02
Junio C Hamano
Hopefull
y
final up
d
ate to the draft Rel
e
a
s
e Notes,
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
Junio
C
Hama
n
o
Optional Tck/
T
k:
ignore generated fi
l
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Jun
i
o C Hamano
Do not bot
h
er d
o
cumenti
n
g f
e
tc
h
--too
l
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Ju
n
io C Hamano
U
p
da
t
e draft release notes f
o
r 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-03-30
Ju
n
io C Ham
a
no
Merge bran
c
h
'm
a
s
ter' of git
:
//repo
.
or
.
cz/git/merg
e
tool
.
git
commit
|
commitdiff
|
tree
2007-03-28
Junio C H
a
m
ano
Documentation: unbr
e
ak user-manua
l
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
J
unio C Haman
o
G
IT 1
.
5
.
1-rc3
commit
|
commitdiff
|
tree
2007-03-28
Juni
o
C Haman
o
Update m
a
in git
.
h
t
ml
page to point at 1
.
5
.
0
.
6 documentation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
J
unio C Hamano
Merge
branch 'maint' to syn
c
hr
o
niz
e
with 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C Haman
o
GIT
1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
J
unio C Haman
o
F
i
x "--pretty
=
format:" for par
e
nt
r
elate
d
items
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio
C Hamano
g
it-
c
ommit: "read-tree -m HEAD" is not the right way
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
J
u
ni
o
C Hamano
sha1
_
file
.
c (write_sha1_file): Detect clos
e
f
a
ilure
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Junio
C Hamano
Docum
e
nt git-log
--fi
r
st-parent
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Junio C Hamano
GI
T
1
.
5
.
1-rc2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Junio C Hamano
Me
r
ge branch 'jc/fpl'
commit
|
commitdiff
|
tree
2007-03-26
Juni
o
C Hamano
Update README to
point
a
t a few key periodical
m
essages
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
Junio C Hamano
Merge br
a
n
c
h '
m
aint'
commit
|
commitdiff
|
tree
2007-03-25
Junio C Hama
n
o
Merge branch 'maint' of git://linux-n
f
s
.
or
g
/~bfiel
d
s
.
.
.
commit
|
commitdiff
|
tree
2007-03-25
Ju
n
io C Ha
m
an
o
Merge branc
h
'
j
s/remote-sho
w
-
p
u
sh'
commit
|
commitdiff
|
tree
2007-03-25
Junio C
Hama
n
o
Mer
g
e br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-03-24
J
u
nio C Hamano
gi
t
-am docu
m
entat
i
on: de
s
c
r
ibe what
i
s taken from w
h
ere
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Junio C
H
a
mano
make the p
r
evious optimization work also on path
-
limited
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Junio C Hamano
rev-list --bisect:
F
i
x
"halfw
a
y" optim
i
zation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Junio C
H
amano
Me
r
ge bran
c
h 'master' into jc/b
i
sect
commit
|
commitdiff
|
tree
2007-03-24
Junio C Hama
n
o
Me
r
g
e branch 'maint'
commit
|
commitdiff
|
tree
2007-03-24
J
u
nio C H
a
mano
F
i
x
p
ath-limited "rev-list --b
i
sect" termination
con
d
ition
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
J
unio C Hamano
git-bisect
.
sh: properly
dq
$
GIT_D
I
R
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Juni
o
C Hamano
git-bisect: typofix
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Jun
i
o C H
a
man
o
chec
k
out: report where the new HE
A
D is
u
po
n
d
e
t
aching
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
J
unio
C
Hamano
t
6004: add a bit
m
ore
path op
t
imization
test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Junio C Hamano
git-apply: Do not fre
e
the wrong buf
f
er when we convert
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
J
u
nio C Hama
n
o
Merge git://g
i
t2
.
kernel
.
org/pub/scm/
g
itk/
g
itk
commit
|
commitdiff
|
tree
2007-03-22
Jun
i
o C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-03-22
Ju
n
io C H
a
mano
gi
t
-rebase: make
'rebase HEAD branc
h
' work as expected
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio C Hama
n
o
gi
t
-rev-list --bisec
t
: optimization
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio C Hamano
git-rev-l
i
st: add --bisect-vars option
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio C H
a
mano
t6
0
02:
m
inor spelling fi
x
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio C Hamano
tree_entry_interes
t
ing(): allow it to say "eve
r
yth
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Ju
n
io C Ham
a
no
tree-dif
f
: avoid strncmp()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
J
unio C Hamano
T
e
ach tree_ent
r
y
_interesting()
t
h
at the tree
e
ntrie
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-21
Junio C Hamano
blame: cmp_suspect
is not "cmp" anymo
r
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-20
Junio C Hamano
Merg
e
git://git2
.
ker
n
el
.
org/p
u
b
/
scm
/
gi
t
k/gitk
commit
|
commitdiff
|
tree
2007-03-20
Junio
C
Hamano
bla
m
e
: micro-o
p
timi
z
e cmp_
s
uspect(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-19
Jun
i
o C Ham
a
no
GIT 1
.
5
.
1-rc1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-19
Junio C H
a
mano
Fix merge-
i
ndex
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-19
Junio C
H
aman
o
Mer
g
e b
r
a
nch
'
jb/gc'
commit
|
commitdiff
|
tree
2007-03-19
Junio C
H
amano
Merge branch 'fl/cvsserve
r
'
commit
|
commitdiff
|
tree
2007-03-19
Junio C Hamano
M
erge branch 'sp/run-
c
ommand'
commit
|
commitdiff
|
tree
2007-03-18
Junio C Hamano
Up
d
ate main gi
t
.
html pa
g
e to po
i
nt a
t
1
.
5
.
0
.
5 documenta
t
ion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-18
Juni
o
C Hamano
Merge b
r
an
c
h 'a
r
/d
i
ff'
commit
|
commitdiff
|
tree
2007-03-18
Junio C Haman
o
Merge
1
.
5
.
0
.
5 in fro
m
'
m
aint
'
commit
|
commitdiff
|
tree
2007-03-18
Junio
C
H
am
a
no
GIT 1
.
5
.
0
.
5
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-17
Junio C
H
amano
M
e
r
ge branch 'ma
i
n
t'
commit
|
commitdiff
|
tree
2007-03-17
Junio C Haman
o
applymbox: brown paper bag fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Ju
n
io C
H
aman
o
g
it
-
lo
g
--
f
irst-p
a
rent: show only
t
he first parent
log
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
J
u
nio C Ham
a
no
try-to-
s
imp
l
ify-commit: use
d
if
f
-tree
--qu
i
et machinery
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Junio C Ham
a
no
revision
.
c:
explain what tree_differenc
e
does
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
J
u
n
io C Haman
o
Teach --quiet to
d
iff b
a
ckend
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Junio C H
a
m
a
no
diff --quiet
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Junio C Hamano
Remove
unused diffco
r
e_std_no_resolve
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Junio C Hamano
M
e
r
g
e G
I
T 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
-
checko
u
t: fix
"
ev
a
l
"
used for merg
e
labe
l
ling
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
J
u
nio
C
Hamano
Merge b
r
anch 'jc/repack'
commit
|
commitdiff
|
tree
2007-03-14
Junio C Hamano
M
erge bran
c
h 'jc/fetch
'
commit
|
commitdiff
|
tree
2007-03-14
Junio
C Haman
o
Merge b
r
a
n
c
h
'dz/
m
aili
n
fo'
commit
|
commitdiff
|
tree
2007-03-14
Ju
n
io C Hamano
Merge bran
c
h 'jb/per-user-e
x
clude'
commit
|
commitdiff
|
tree
2007-03-14
Junio C
H
aman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-03-14
Junio C Hamano
Merg
e
branch 'pb/br
a
nch-track
'
commit
|
commitdiff
|
tree
2007-03-14
Junio C Ham
a
no
shortlog: prompt when reading from termina
l
by mi
s
take
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Junio C
H
a
mano
Document
a
ti
o
n:
add git-me
r
ge
t
o
o
l to the command list
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Junio C Haman
o
Me
r
ge br
a
nch 'master' of g
i
t:
/
/repo
.
or
.
cz/git/m
e
rgetool
commit
|
commitdiff
|
tree
2007-03-13
J
unio C Hamano
Merge
b
ranch 'master' o
f
git://repo
.
or
.
cz/gi
t
-gu
i
commit
|
commitdiff
|
tree
2007-03-13
Junio C Ha
m
ano
Mer
g
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-03-13
Junio C Hamano
Merge branch '
m
aster' of
g
i
t
://r
e
po
.
or
.
cz/git/fastimport
commit
|
commitdiff
|
tree
2007-03-13
Ju
n
io C
Hamano
Merge branch 'maint'
of git://repo
.
or
.
cz/git/fastimport
.
.
.
commit
|
commitdiff
|
tree
2007-03-12
Junio
C
H
amano
Me
r
ge branch 'maint' of git://repo
.
or
.
cz/git-gui into
.
.
.
commit
|
commitdiff
|
tree
2007-03-12
Juni
o
C
H
a
m
a
n
o
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2007-03-12
J
u
n
io C Ha
m
ano
Merge branch 'jc/bo
u
nd
a
ry'
commit
|
commitdiff
|
tree
2007-03-11
Juni
o
C Hamano
prepare_
p
acked_git(): s
o
rt pack
s
by
ag
e
and localness
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-11
J
u
nio C H
a
m
ano
Fix
broken c
r
eat
e
_branch() in
b
uiltin-b
r
anch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-11
Jun
i
o
C
Ham
a
no
Merge branch 'js
/
a
t
tach
'
commit
|
commitdiff
|
tree
2007-03-11
Jun
i
o C Hamano
Mer
g
e branch 'js
/
di
f
f-ni'
commit
|
commitdiff
|
tree
next