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
Merge branch 'maint'
2007-04-10
J
u
ni
o
C Ham
a
n
o
merge-recurs
i
ve: do not barf
on
"to be re
m
oved" entries
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C H
a
mano
Treat D/F
conf
l
i
c
t e
n
try more carefu
l
ly
i
n
u
npack-trees
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Haman
o
t1000: fix case table
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Juni
o
C H
a
mano
shortlog -w: m
a
ke wra
p
-line behavio
u
r optional
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
J
u
n
i
o C H
a
mano
M
e
r
ge
br
a
nch 'jc/push'
commit
|
commitdiff
|
tree
2007-04-09
Jun
i
o C Hamano
Merg
e
branch 'jc/merge-subtree'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
J
unio C
H
a
m
ano
Merge
b
ranch '
j
s/fetch-prog
r
ess'
commit
|
commitdiff
|
tree
2007-04-09
J
u
nio C Hamano
M
erge branch
'maint'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Ham
a
no
Ad
d
D
ocument
a
tion
/
cmd-list
.
m
ade to
.
g
itignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Ju
n
io C H
a
ma
n
o
Start
1
.
5
.
2 c
y
cle by prep
a
r
eing RelNot
e
s for
it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
J
u
n
i
o
C Hamano
Merge b
r
anc
h
'
j
c/read-t
r
ee-df' (early part)
commit
|
commitdiff
|
tree
2007-04-08
Junio C
H
amano
Me
r
ge
branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-08
Junio C Ham
a
no
Prepare 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
m
erge stragety 'subtree'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hama
n
o
g
i
t
-
pus
h
to multipl
e
locations d
o
es not sto
p
at
the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C Ha
m
an
o
git-push
r
eports the URL
after failing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C Hamano
Merge branc
h
'jc/index-o
u
tput'
commit
|
commitdiff
|
tree
2007-04-07
Junio C
H
am
a
no
Mer
g
e branc
h
'fp/make-j'
commit
|
commitdiff
|
tree
2007-04-07
J
unio C Hamano
Merge branc
h
'
cc/bisect'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Haman
o
Merge branch
'
jc/chec
k
o
ut'
(
early part)
commit
|
commitdiff
|
tree
2007-04-07
J
u
n
i
o C Haman
o
Me
r
ge branc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C
H
am
a
no
Documentation:
t
ight
e
n
dependency for gi
t
.
{
html,txt}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
git-
b
isect: allo
w
bi
s
e
cting with only
one bad commit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
unio C Hamano
t
6
030
:
add a
b
i
t more tests to
git-bisec
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Junio
C Hamano
git-bisect: moderni
z
ati
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Ju
n
io C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-05
Junio C Ham
a
no
Ren
a
me add
_
file_to_index() to a
d
d_file_to_cache(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C H
a
mano
Rename stat
i
c vari
a
ble write_index to up
d
ate_index
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C H
a
m
a
no
Rename int
e
rnal function
"
ad
d
_
f
i
le_
t
o_
c
ach
e
" in bui
l
tin
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Jun
i
o C Ha
m
ano
Prop
a
gat
e
cache
error inter
n
al to refr
e
sh_cache() via
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
J
un
i
o C Hamano
Fi
x
bogus error mes
s
age from merg
e
-r
e
cursiv
e
er
r
o
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Fix dependency of common-cmds
.
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Hama
n
o
RP
M
spec
:
i
nclude git-p4 in the li
s
t
of all packages
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C Hamano
rerere
:
make so
r
tin
g
really stabl
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio
C Haman
o
Fix s
w
itching
t
o a branch with D/F when current branc
h
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C Hamano
Fix twoway_merge that passed d/f conflict marker t
o
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Hama
n
o
Fix read-
t
ree --prefix=dir/
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
unio
C
H
amano
u
n
pack-tree
s
: get rid o
f
*indpos
param
e
ter
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hama
n
o
unpack_
t
rees
.
c: pa
s
s unpack_trees_o
p
tions
s
truc
t
ure
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
add_cache_en
t
ry(): removal of file fo
o
does
not conflict
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge bra
n
ch 'jc/bis
e
ct'
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C Hamano
Mer
g
e branch 'fl/
d
oc'
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C Ha
m
ano
Merge branch
'post1
.
5
.
1
/
blame
.
el'
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Hamano
Merge branch '
p
ost1
.
5
.
1/tc
l
tk'
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
ama
n
o
Mer
g
e branch 'post1
.
5
.
1/p4
'
commit
|
commitdiff
|
tree
2007-04-04
Junio C H
a
mano
Merge branc
h
'
l
t/dirwalk'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
git-rea
d
-tree --in
d
ex-out
p
u
t=<fi
l
e>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
unio C Hamano
_GIT_INDEX_OUTPUT: allow plumbin
g
to output to an alternativ
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C H
a
mano
ch
e
ck
o
ut: allow det
a
ch
i
n
g
to HEAD e
v
e
n when swit
c
hing
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ham
a
n
o
GI
T
1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
unio C Ha
m
a
no
Mer
g
e 1
.
5
.
0
.
7 in
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
amano
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 not repea
t
the
earlier
hu
n
k
s
in
l
ater
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-02
Junio C Hamano
H
opefully final up
d
at
e
to the draft Release Notes,
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
Junio C Ham
a
no
Optiona
l
Tck/Tk: i
g
no
r
e gen
e
rated files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Jun
i
o C Ham
a
n
o
Do not bot
h
er d
o
cu
m
enting
f
etch--too
l
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
J
u
nio C
Hamano
U
p
d
ate dra
f
t rele
a
s
e notes for 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
J
unio
C Hamano
M
e
rge branc
h
'maint'
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
Merge branch 'master' of git://repo
.
o
r
.
c
z
/gi
t
/mergetool
.
git
commit
|
commitdiff
|
tree
2007-03-28
J
unio C Ham
a
n
o
Docume
n
tation: unbre
a
k u
s
er-manual
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Ju
n
io
C
Ham
a
no
GIT 1
.
5
.
1
-
rc3
commit
|
commitdiff
|
tree
2007-03-28
Ju
n
io C
H
ama
n
o
Update main git
.
html
p
age to poin
t
at 1
.
5
.
0
.
6 documenta
t
ion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
J
u
ni
o
C Hama
n
o
Merge branch
'
maint' to syn
c
hronize with 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
G
I
T 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
F
ix "--p
r
etty=format:" for
pare
n
t rela
t
ed i
t
ems
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
git-c
o
mmit: "
r
ead-tree -m
H
EAD" is not the right
w
ay
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Ju
n
io C Hamano
s
h
a1_file
.
c (write_sha1_file):
D
etect clo
s
e f
a
ilure
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Ju
n
io C Hamano
Documen
t
git-log --first-pare
n
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Junio C
H
a
mano
GIT 1
.
5
.
1-rc2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Junio C Hamano
Merge
branc
h
'jc/f
p
l'
commit
|
commitdiff
|
tree
2007-03-26
Junio C Hamano
Upd
a
te
R
EADME to p
o
int at
a
fe
w
k
ey perio
d
i
c
al messages
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
J
unio C
H
am
a
no
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-03-25
Junio
C
Hamano
M
e
rg
e
branch 'maint' of
g
i
t
:
//linux-nfs
.
org/~bfields
.
.
.
commit
|
commitdiff
|
tree
2007-03-25
Junio C Hama
n
o
Merge
bra
n
ch '
j
s/re
m
o
t
e-show-push'
commit
|
commitdiff
|
tree
2007-03-25
Jun
i
o C Ham
a
no
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-03-24
Junio C Ha
m
ano
git-am documentation: describe wh
a
t is taken fro
m
where
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Ju
n
i
o
C
Ham
a
no
make the previous
o
ptimi
z
ation work also on path-limited
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
J
u
nio
C
Hamano
rev-lis
t
--bisect: Fix "halfway" optim
i
zation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Ju
n
io C Hamano
Me
r
ge branch '
m
as
t
er' into jc/bise
c
t
commit
|
commitdiff
|
tree
2007-03-24
Jun
i
o
C Hamano
M
e
rge branch 'main
t
'
commit
|
commitdiff
|
tree
2007-03-24
Junio
C
Hamano
Fi
x
path-limited
"
r
ev-list --bi
s
ect" termination conditio
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Junio
C Hamano
g
it-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-
b
is
e
c
t: t
y
pofix
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Juni
o
C Hamano
checkou
t
: report where th
e
n
e
w HEAD is upon
detaching
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Ju
n
io C
H
amano
t6004: add a bit mo
r
e path
o
p
t
i
m
ization te
s
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Junio C Hamano
git-apply: Do not free t
h
e
wr
o
ng buffer when
w
e co
n
vert
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio C
Ha
m
ano
M
e
rge
g
it://git2
.
k
e
rnel
.
org/
p
ub/
s
cm/g
i
t
k
/git
k
commit
|
commitdiff
|
tree
2007-03-22
Junio C Hamano
Merge branch
'mai
n
t'
commit
|
commitdiff
|
tree
2007-03-22
Junio C Hamano
git-r
e
b
ase: make '
r
eb
a
se HEAD
b
ranch
'
w
o
r
k
as expected
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio C Haman
o
git-
r
ev
-
list --bisect: optimi
z
ation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Juni
o
C Haman
o
g
i
t
-rev-list:
a
dd --bisect-va
r
s option
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Ju
n
i
o
C H
a
mano
t600
2
: minor spell
i
ng f
i
x
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio C Hamano
tree_entry_in
t
e
r
esting
(
): allow it to say "everythin
g
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
J
u
nio C Hamano
tree-diff:
a
void s
t
r
n
cmp()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio
C
Ham
a
no
T
each tree_entry_interesti
n
g() that the tree entries
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-21
Junio C Hamano
blame: cmp_sus
p
ect i
s
not "cmp" an
y
more
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-20
Juni
o
C
Hama
n
o
Merg
e
g
it://git2
.
kern
e
l
.
org/
p
ub
/
s
cm/gi
t
k/gitk
commit
|
commitdiff
|
tree
2007-03-20
Juni
o
C Hamano
blame: micro-optimiz
e
cm
p
_suspect()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-19
Junio C
H
amano
GIT 1
.
5
.
1-rc1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-19
Jun
i
o
C
Hama
n
o
Fix merge-inde
x
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next