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
Treat D/F conflict entry more carefully in unpack-trees.c::threeway_merge()
2007-04-10
J
unio C Hamano
T
r
eat
D
/F conf
l
ict entry
mo
r
e c
a
refully in unpack-tree
s
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
t
1000:
f
ix
c
a
s
e table
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
J
u
nio C Hamano
Merge bra
n
ch 'jc/push'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Ham
a
no
Merge branch 'j
c
/merge-sub
t
ree'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Ha
m
a
n
o
Merge bran
c
h 'js/fetch-p
r
ogress'
commit
|
commitdiff
|
tree
2007-04-09
Junio
C Ham
a
no
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
Junio
C Hama
n
o
Add
D
o
cumentation/cmd-list
.
made
t
o
.
git
i
gnore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio
C
H
amano
S
t
art 1
.
5
.
2 cycl
e
b
y p
r
e
pareing RelNotes
f
or it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Mer
g
e bra
n
ch '
j
c/read-tree-df' (e
a
rly p
a
rt)
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Merge bra
n
ch
'maint'
commit
|
commitdiff
|
tree
2007-04-08
J
unio C Hamano
P
r
epare
for 1
.
5
.
1
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
A
n
ew merg
e
stragety 'subtr
e
e'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C
H
amano
git-push to mult
i
ple location
s
d
oe
s
not stop
a
t the
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C
H
a
m
a
no
git-push reports t
h
e URL after failing
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
J
unio C Hamano
Merge branc
h
'jc/
i
nd
e
x
-out
p
ut'
commit
|
commitdiff
|
tree
2007-04-07
Junio C
Hamano
M
e
r
g
e
b
ranch 'fp/make-j'
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
Hamano
M
e
rge branch 'cc/bi
s
e
ct'
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
Hamano
Mer
g
e bra
n
ch '
j
c
/che
c
kout' (early
p
art)
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o C Haman
o
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
mano
Docum
e
ntation: t
i
ghte
n
d
ependency
for git
.
{
h
tml,txt}
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C Hamano
git-bisect: allow
b
i
secting w
i
th onl
y
one b
a
d commit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
Hamano
t
6
030:
add a
b
it m
o
re
t
e
s
ts to git-bise
c
t
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Junio C H
a
mano
git-bisect: moderniz
a
tion
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Juni
o
C Ham
a
no
M
er
g
e branch
'maint'
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hama
n
o
Rename add_file_to_index() to add_file_to_c
a
che()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hama
n
o
Rename static variable writ
e
_in
d
ex
to
update_index
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Renam
e
internal functi
o
n
"add_file_t
o
_cache" in builtin
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C Hamano
Prop
a
gate cache er
r
or in
t
ernal to ref
r
e
s
h_cache() via
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Fix bogus
e
rror
m
e
ssage f
r
om merge-recursive error
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C
H
a
mano
Fix dependency of co
m
mon
-
c
m
ds
.
h
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C
H
aman
o
RPM spec: incl
u
de git-p4 in the l
i
st of all pac
k
a
g
es
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
H
a
mano
rerere: ma
k
e sorting really stable
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
unio C Ham
a
n
o
Fix switch
i
ng
to a branc
h
with D/F when
c
u
rrent branch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
unio C H
a
ma
n
o
Fix twoway_mer
g
e tha
t
passed
d
/
f conflict marker to
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Hamano
Fi
x
rea
d
-tree --prefix=dir/
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
unpack
-
t
r
ees
:
get rid of *indpos
p
arameter
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Ha
m
a
n
o
unpack_trees
.
c:
pas
s
unpac
k
_trees_option
s
st
r
u
c
ture
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
u
n
io
C
Hamano
add_c
a
che
_
entry():
removal of file foo does not
c
onfl
i
ct
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio
C
Ham
a
no
Merge b
r
anc
h
'jc/bisect'
commit
|
commitdiff
|
tree
2007-04-04
Junio C H
a
man
o
Merge
b
ra
n
c
h 'f
l
/doc'
commit
|
commitdiff
|
tree
2007-04-04
Junio C H
a
m
a
no
Merge branch 'post1
.
5
.
1/blame
.
el'
commit
|
commitdiff
|
tree
2007-04-04
J
uni
o
C Ha
m
an
o
M
erge branc
h
'pos
t
1
.
5
.
1/t
c
ltk'
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Hamano
Merg
e
br
a
nch '
p
os
t
1
.
5
.
1/p4'
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Hama
n
o
Merge bra
n
ch 'lt/dir
w
a
l
k
'
commit
|
commitdiff
|
tree
2007-04-04
J
u
n
i
o C Hamano
git-r
e
ad-tree --
i
ndex-outpu
t
=<file>
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C Ham
a
no
_GIT_INDEX_O
U
TPUT: all
o
w plumbing to output to an
alternativ
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io
C Hamano
checkout: allow detaching to HEAD ev
e
n wh
e
n swit
c
h
ing
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ha
m
ano
G
IT
1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Hamano
Me
r
ge 1
.
5
.
0
.
7 in
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Hama
n
o
GIT 1
.
5
.
0
.
7
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io
C
Ha
m
a
n
o
r
erere shou
l
d not re
p
eat the earlier hunk
s
in
l
ater
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-02
J
unio C
H
ama
n
o
Hopefully fin
a
l update to
the d
r
af
t
Re
l
ease
N
otes,
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-01
Junio C Hamano
Optional Tck/Tk: ignore g
e
nerated files
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Juni
o
C Hamano
Do n
o
t bother d
o
c
umenting fetch-
-
tool
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Ham
a
no
Update draft release notes for 1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
J
unio C
H
amano
Merge
branch
'
m
aint'
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
Merge
b
ranch 'master' of git://repo
.
or
.
c
z/git/mergetool
.
git
commit
|
commitdiff
|
tree
2007-03-28
J
u
nio C H
a
ma
n
o
Documentation
:
unbreak user-manual
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
GIT 1
.
5
.
1-rc3
commit
|
commitdiff
|
tree
2007-03-28
Juni
o
C Hamano
Update main git
.
html
page to poi
n
t
at 1
.
5
.
0
.
6
do
c
umenta
t
ion
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Junio
C
H
ama
n
o
Merge branch '
m
a
int'
to s
y
nchr
o
niz
e
with 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C
Hamano
GIT 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Jun
i
o C Hamano
Fix
"
--
p
retty=for
m
at:" for parent
related ite
m
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
J
unio C Hamano
git-co
m
mi
t
: "read-
t
ree -m HE
A
D" is not the righ
t
w
ay
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Junio C Haman
o
sh
a
1_f
i
le
.
c
(write_sha1_file):
D
etect close f
a
ilure
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Junio C Hamano
Document git-log --first
-
parent
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-26
Junio C H
a
mano
G
I
T 1
.
5
.
1-
r
c
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-26
Junio C Ha
m
ano
Merge branch 'jc/fpl'
commit
|
commitdiff
|
tree
2007-03-26
J
u
nio C Hamano
Up
d
ate README
t
o point at a few key p
e
r
i
o
dical mess
a
ges
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-25
Junio
C
H
a
mano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-03-25
J
unio C
H
amano
Merge branch 'maint' of gi
t
:
//linux-
n
fs
.
or
g
/~
b
fie
l
d
s
.
.
.
commit
|
commitdiff
|
tree
2007-03-25
Jun
i
o
C Haman
o
Merge branch 'js
/
r
e
mot
e
-show-p
u
sh
'
commit
|
commitdiff
|
tree
2007-03-25
J
u
nio C
H
amano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2007-03-24
Junio C Ham
a
no
git-
a
m
documen
t
at
i
on: describe what is taken from
where
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-24
Ju
n
i
o
C Hama
n
o
make t
h
e previous optimiz
a
tion work also on path-limited
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-24
J
unio C
H
a
mano
rev-l
i
s
t
--bisec
t
: Fix "ha
l
f
w
ay" optim
i
z
a
tion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-24
Junio C Hamano
Merge b
r
anch 'master' into jc/bisect
commit
|
commitdiff
|
tree
2007-03-24
J
u
n
io C Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-03-24
J
unio C Hamano
Fi
x
path-limited "rev-list --bisec
t
" ter
m
in
a
tion condition
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-23
Jun
i
o C
H
amano
gi
t
-
bisect
.
s
h: properly dq $GIT_DIR
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-23
Junio
C Hamano
git-bise
c
t
:
ty
p
ofix
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-23
Junio
C Ham
a
no
checkout: report where the
n
e
w HEAD is upon
d
e
t
achin
g
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-23
Junio C
H
a
m
ano
t6004: add a bit m
o
re path optimization test
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-23
Junio C Ha
m
ano
git-app
l
y:
Do n
o
t free the wrong b
u
ffer when we c
o
nvert
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-22
Junio C Hamano
Mer
g
e git://
g
i
t
2
.
kerne
l
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2007-03-22
Junio C Hamano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-03-22
Junio C Ham
a
no
git-rebase: make
'
rebase H
E
AD
b
ra
n
ch' work as expecte
d
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-22
J
u
nio C Hamano
git-rev-list --bisect:
o
ptimi
z
ation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-22
J
u
n
i
o C Hamano
gi
t
-rev-list: add --b
i
se
c
t-vars option
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-22
Ju
n
io C Hamano
t
6002: minor
spel
l
in
g
fix
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-22
Junio
C
Hamano
t
ree_entry_interesting():
a
llow it to say "everything
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-22
Junio C Hamano
tr
e
e-d
i
ff: avo
i
d str
n
cmp()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-22
Junio C H
a
mano
Tea
c
h tree_entry_i
n
teresti
n
g() that the tr
e
e entries
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-21
Junio
C
Hamano
bla
m
e: cmp
_
s
us
p
ect is no
t
"
c
mp" anymore
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-20
Junio C Haman
o
Merge gi
t
://git2
.
kernel
.
org/
p
ub/scm/git
k
/
g
itk
commit
|
commitdiff
|
tree
2007-03-20
Ju
n
io C
H
amano
bl
a
me
:
m
i
cro-optimize cmp_s
u
spect()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-19
J
unio C Hama
n
o
GIT 1
.
5
.
1-rc1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-19
Junio C Ham
a
no
Fix merge-
i
n
de
x
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-19
Junio C
H
a
m
a
no
M
er
g
e branch 'j
b
/gc'
commit
|
commitdiff
|
tree
2007-03-19
Jun
i
o
C
H
amano
M
erge b
r
anch 'fl
/
cvsserver'
commit
|
commitdiff
|
tree
next