repo.or.cz
/
alt-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
Jun
i
o
C Hamano
F
ix twoway_merge th
a
t passed d/f conflict marker to
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hama
n
o
Fix read-tree --prefix=
d
ir/
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C H
a
mano
unpack-tre
e
s: get rid of *indpos para
m
eter
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
unio C Hamano
unpa
c
k
_
trees
.
c: pass u
n
pack_trees_options structure
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
n
i
o C Hamano
add_cache_entry(
)
: removal
o
f fi
l
e
foo does
n
ot conflict
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Haman
o
M
erg
e
branch 'jc/bisec
t
'
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Hamano
Merge branch 'fl/doc'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hama
n
o
M
erge branch 'post1
.
5
.
1
/
blame
.
e
l'
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C Hamano
Merge
branch 'post1
.
5
.
1/t
c
ltk'
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Hamano
Merge bra
n
ch 'p
o
st1
.
5
.
1/
p
4'
commit
|
commitdiff
|
tree
2007-04-04
Junio C H
a
mano
M
erge branch 'l
t
/di
r
walk'
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
amano
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
i
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C H
a
ma
n
o
GIT 1
.
5
.
0
.
7
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
unio C Hamano
rerere should
not r
e
p
eat
t
he
e
a
r
lier hunks in later
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-02
J
u
nio C Haman
o
Hopefully
fi
n
al
updat
e
to the draft R
e
lease N
o
tes,
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
J
u
nio C Hamano
Optiona
l
Tck
/
Tk: ignor
e
generated files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C
H
amano
Do no
t
bot
h
e
r
documenting fetch--tool
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
J
unio C Hamano
U
pda
t
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 branch 'maint'
commit
|
commitdiff
|
tree
2007-03-30
Junio C H
a
man
o
Merge branch 'master' of
g
i
t:
/
/
r
epo
.
or
.
cz/git/merg
e
tool
.
git
commit
|
commitdiff
|
tree
2007-03-28
J
unio C
Hamano
Documentation: u
n
break
u
s
er-
m
anual
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C
H
aman
o
GIT 1
.
5
.
1-rc3
commit
|
commitdiff
|
tree
2007-03-28
Juni
o
C Haman
o
U
p
d
a
te mai
n
git
.
h
tml page to poi
n
t
a
t
1
.
5
.
0
.
6 documentatio
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio
C
Haman
o
Merg
e
branch 'maint'
t
o
synchroni
z
e with 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C Ha
m
ano
GIT 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
J
u
nio C
H
amano
Fix "--pretty=
f
orm
a
t:" for pa
r
ent related item
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio
C Hama
n
o
git-commit
:
"read-tree -m HEAD
"
i
s not the
right
way
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Junio
C Hama
n
o
sha1_file
.
c (write_sha1_file): Detect
c
lose failure
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Junio C Hama
n
o
D
o
cument git-log
--first-parent
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
J
u
nio C
H
amano
M
e
r
ge bra
n
ch 'jc/fpl'
commit
|
commitdiff
|
tree
2007-03-26
Ju
n
i
o
C H
a
m
an
o
Upd
a
te README to p
o
int at a fe
w
key periodical
m
e
s
sages
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
Ju
n
io C Hamano
Me
r
ge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-03-25
Junio C Hamano
M
erge b
r
anch
'maint' of git://linux-nfs
.
o
r
g/~bfields
.
.
.
commit
|
commitdiff
|
tree
2007-03-25
J
unio
C
H
a
man
o
Merg
e
branch 'js/remote-show-
p
ush'
commit
|
commitdiff
|
tree
2007-03-25
Junio C Haman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-03-24
Jun
i
o
C Haman
o
git-
a
m
documen
t
a
tion
:
de
s
cribe what is taken from where
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Junio C Hamano
make the previous
o
ptimizatio
n
work also on pat
h
-limited
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Junio C H
a
mano
re
v
-
l
i
s
t
--b
i
se
c
t: Fix "halfway" opti
m
iz
a
t
i
on
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Junio C H
a
ma
n
o
Merge
b
r
anch
'
master' in
t
o jc/bi
s
e
ct
commit
|
commitdiff
|
tree
2007-03-24
Junio C Hamano
M
e
rge bra
n
ch
'
m
aint'
commit
|
commitdiff
|
tree
2007-03-24
J
unio C Hamano
Fix path-lim
i
t
e
d "
r
ev
-
l
ist --
b
isect" termina
t
ion condition
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Juni
o
C Hamano
git-bisect
.
sh: properly dq
$
GIT_DIR
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Junio C Hamano
gi
t
-
bise
c
t: typofix
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Junio C Hama
n
o
chec
k
o
ut:
report wher
e
the new HEAD is upon detaching
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
J
u
nio
C Hama
n
o
t6004: add a bit more
p
ath opt
i
m
i
zation test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Junio C Hama
n
o
git-apply: Do
n
ot fr
e
e the wrong buff
e
r when we
c
o
n
vert
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio C Hama
n
o
Merge
git://git2
.
kernel
.
org/pub/scm/
g
itk/gi
t
k
commit
|
commitdiff
|
tree
2007-03-22
Junio C Hamano
Mer
g
e bran
c
h 'maint
'
commit
|
commitdiff
|
tree
2007-03-22
Junio C Hama
n
o
git-rebase
:
ma
k
e
'
rebase HEAD
branch' work as exp
e
cted
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
J
unio
C
Ham
a
no
git-r
e
v-
l
ist
--
b
isect: optimization
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio
C Ham
a
no
git-r
e
v-lis
t
:
a
dd
-
-
bisec
t
-vars op
t
ion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Jun
i
o C Hama
n
o
t6002: minor spelling fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio C
Hamano
tree
_
en
t
ry_interesting(): allow it to say "everything
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Juni
o
C
Hamano
tree-d
i
f
f: avo
i
d strncmp
(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio C
H
amano
Teach tree_entry_inte
r
esting() that the tree entries
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-21
Junio C Haman
o
b
lame: cmp_susp
e
ct is
not "cmp"
a
nym
o
re
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-20
Junio
C
Hamano
Mer
g
e git://git2
.
kern
e
l
.
org/pub/s
c
m/git
k
/gitk
commit
|
commitdiff
|
tree
2007-03-20
Jun
i
o C
Hamano
blame:
mi
c
ro-optimize cmp_s
u
spect
(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-19
Junio C Hamano
GI
T
1
.
5
.
1-r
c
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-19
Juni
o
C Ham
a
no
Fix mer
g
e-index
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-19
Junio C Haman
o
Mer
g
e branch '
j
b
/gc
'
commit
|
commitdiff
|
tree
2007-03-19
Junio C
Hamano
Merge branch 'fl/cvsserve
r
'
commit
|
commitdiff
|
tree
2007-03-19
Junio C Ha
m
ano
Merge branc
h
'sp/run-com
m
and'
commit
|
commitdiff
|
tree
2007-03-18
Junio C Ham
a
n
o
Update main git
.
html
page
to point at 1
.
5
.
0
.
5
documentation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-18
Junio C
Hamano
M
e
rge branch
'ar/
d
i
f
f
'
commit
|
commitdiff
|
tree
2007-03-18
Junio C H
a
mano
Merge
1
.
5
.
0
.
5 in
from 'maint'
commit
|
commitdiff
|
tree
2007-03-18
Junio C Hamano
G
I
T 1
.
5
.
0
.
5
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-17
J
u
nio C Haman
o
Merge bra
n
ch
'
maint'
commit
|
commitdiff
|
tree
2007-03-17
Junio
C
Hamano
applymbox: br
o
wn paper bag
f
ix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Junio C
Hamano
git-log --fi
r
st-p
a
rent:
show
o
nly th
e
fir
s
t
parent log
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Junio
C
H
a
m
a
no
try-to-simplify-commit: use diff-tree --quiet mac
h
i
n
e
ry
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Jun
i
o
C
Hamano
r
evision
.
c: explain what t
r
ee
_
di
f
ferenc
e
does
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Junio C Ha
m
an
o
Tea
c
h
-
-
q
uiet to diff ba
c
k
ends
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
J
uni
o
C Hamano
diff --quiet
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Ju
n
i
o C
Hamano
Rem
o
ve
un
u
sed diffcore
_
std_n
o
_res
o
lve
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Junio C Ha
m
ano
Merge
G
IT
1
.
5
.
0
.
4
commit
|
commitdiff
|
tree
2007-03-14
Ju
n
io
C Hamano
GIT 1
.
5
.
0
.
4
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Jun
i
o C Hamano
git-checkout: f
i
x
"eval" used for merge la
b
e
l
ling
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Junio C
Hamano
Merge
b
ran
c
h 'jc
/
repack'
commit
|
commitdiff
|
tree
2007-03-14
Junio C Hamano
Merge bran
c
h 'j
c
/
f
e
tch'
commit
|
commitdiff
|
tree
2007-03-14
Junio C Hamano
Me
r
ge
branch 'dz/mailinfo'
commit
|
commitdiff
|
tree
2007-03-14
Junio
C Ha
m
a
n
o
Merge bran
c
h 'jb/per
-
user-exclude'
commit
|
commitdiff
|
tree
2007-03-14
J
unio
C
Hamano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-03-14
Junio
C Hama
n
o
Merge branch 'pb/branch-t
r
ack'
commit
|
commitdiff
|
tree
2007-03-14
Junio C
Hamano
shortlog
:
prompt
w
h
en
r
e
a
ding fr
o
m
t
ermina
l
b
y
mistake
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Junio
C
H
a
m
ano
D
o
cume
n
tation: add git-mergetool to the command list
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-14
Junio C Hamano
Merge b
r
anch 'master' o
f
git:/
/
repo
.
o
r
.
cz/git/mergetool
commit
|
commitdiff
|
tree
2007-03-13
J
u
nio
C Hamano
Merge br
a
nc
h
'm
a
ster
'
of
git:/
/
r
epo
.
or
.
c
z
/
g
it-gui
commit
|
commitdiff
|
tree
2007-03-13
Junio C Hamano
M
e
r
g
e branch 'maint'
commit
|
commitdiff
|
tree
2007-03-13
Junio C H
a
mano
M
er
g
e branch
'
master' of git://
r
epo
.
or
.
cz/git/fa
s
timpor
t
commit
|
commitdiff
|
tree
2007-03-13
Junio C Hamano
Me
r
ge bran
c
h
'maint' o
f
gi
t
://repo
.
or
.
cz/g
i
t
/
fastimport
.
.
.
commit
|
commitdiff
|
tree
2007-03-12
Junio
C Ham
a
no
Merge b
r
a
n
ch 'maint' o
f
git://
r
epo
.
or
.
cz/git-gui in
t
o
.
.
.
commit
|
commitdiff
|
tree
2007-03-12
Juni
o
C Hamano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2007-03-12
J
unio C Hamano
Merge bran
c
h 'jc
/
bounda
r
y'
commit
|
commitdiff
|
tree
2007-03-11
Junio
C
Haman
o
prepare_packed_git(): sort packs by age and loca
l
ness
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-11
J
unio C Hamano
Fix broken create_branch()
in builtin-branch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-11
Junio C Ham
a
n
o
Merge branch 'js/attach'
commit
|
commitdiff
|
tree
2007-03-11
J
u
nio C Hamano
Me
r
g
e
bra
n
c
h
'js/
d
iff-ni'
commit
|
commitdiff
|
tree
next