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
merge-recursive: do not barf on "to be removed" entries.
2007-04-10
Junio C Hamano
merg
e
-recursive:
d
o not barf on "to b
e
removed"
e
n
tries
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Juni
o
C
Hamano
Treat D/F
c
onfli
c
t en
t
ry more
c
arefully
in u
n
pack-trees
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
t10
0
0: fix case table
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio
C
Hamano
Merge b
r
anc
h
'jc
/
pu
s
h'
commit
|
commitdiff
|
tree
2007-04-09
J
u
n
io C
H
am
a
no
Merge
b
ranch 'jc/merge-s
u
bt
r
ee
'
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merge branch 'js
/
fetch-p
r
ogress'
commit
|
commitdiff
|
tree
2007-04-09
Junio
C
Hamano
Merg
e
bran
c
h 'mai
n
t
'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Add
D
ocument
a
t
ion/cmd-list
.
made to
.
giti
g
nore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Juni
o
C Hamano
Start 1
.
5
.
2 cycle by pr
e
p
a
re
i
n
g
RelNote
s
for it
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Ham
a
n
o
Merge branc
h
'jc/read-tree-df'
(
early par
t
)
commit
|
commitdiff
|
tree
2007-04-08
Junio
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-08
Junio C Ha
m
ano
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
ne
w
merge stragety 'subt
r
ee'
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
H
amano
git-push to mu
l
tip
l
e locations doe
s
not stop a
t
the
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o C Hamano
g
i
t-push rep
o
rts the URL after
f
ai
l
ing
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Ha
m
ano
M
e
r
g
e branc
h
'
j
c/index-output'
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
mano
Mer
g
e branch 'fp/make-j'
commit
|
commitdiff
|
tree
2007-04-07
J
un
i
o
C
Hamano
Merge bran
c
h
'cc/bisect'
commit
|
commitdiff
|
tree
2007-04-07
Junio C
H
a
m
ano
Merg
e
branch
'
j
c
/checkout' (early p
a
rt)
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
m
an
o
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ha
m
ano
D
o
cumen
t
ation: tigh
t
en
d
ependency f
o
r git
.
{html,txt}
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hama
n
o
git-bisect:
allow bisecting
w
i
t
h only
o
ne
ba
d
commit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
t6030: add a b
i
t
m
o
r
e tests to g
i
t-bisect
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-06
Ju
n
io
C
H
amano
git-b
i
sect: modernizat
i
o
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2007-04-05
J
unio C H
a
m
a
no
Rename
a
dd_fil
e
_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 Hamano
Renam
e
static v
a
r
iab
l
e w
r
ite_index to
u
pdate_index
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
R
ename
i
n
ternal function "ad
d
_file_to_cache"
in bu
i
l
t
in
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Pr
o
pagate cache error internal
to refresh_
c
ache() via
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Fix bogus e
r
ror message from
m
erge-recursive error
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Ha
m
ano
Fix depen
d
ency of common-cmds
.
h
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C
Hamano
RPM spec: incl
u
de
g
i
t
-p4
i
n th
e
list of all pac
k
ages
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
amano
rerere: make
s
orting real
l
y
stab
l
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C Hama
n
o
Fix
s
witch
i
n
g to a branch with D/F w
h
en current
b
r
anch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Fi
x
tw
o
w
a
y_merge that
p
a
s
sed
d
/f
c
onfli
c
t marker to
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
amano
Fix r
e
ad-t
r
ee -
-
prefix=dir/
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
i
o C Hamano
u
n
pack-tree
s
:
ge
t
ri
d
of *indpos
parameter
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
unpack
_
trees
.
c: pass u
n
pack_trees_opti
o
ns st
r
ucture
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ham
a
no
add_cache_entry(): rem
o
v
a
l
of file foo does no
t
con
f
l
ict
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ha
m
ano
Merge bran
c
h 'jc/bisect'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
M
e
rge
branch 'fl/doc'
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Hamano
M
e
rg
e
br
a
nch 'post1
.
5
.
1
/blame
.
el'
commit
|
commitdiff
|
tree
2007-04-04
Junio C H
a
m
a
no
Merge branc
h
'post1
.
5
.
1/tcltk'
commit
|
commitdiff
|
tree
2007-04-04
J
un
i
o C Ha
m
ano
Merge bra
n
ch
'
post1
.
5
.
1/p
4
'
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C Hamano
Merg
e
b
ranch 'lt/dirw
a
lk'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hama
n
o
git-
r
ead-tree --index-output=<file>
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
u
ni
o
C
Hamano
_GIT_INDEX_O
U
TPUT:
allow pl
u
mbing
to output to an alternativ
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
J
uni
o
C H
a
mano
checkout: a
l
low
detaching to HEAD
even when switching
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Haman
o
GIT 1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Ha
m
a
n
o
Merg
e
1
.
5
.
0
.
7 in
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
H
a
m
a
no
GIT
1
.
5
.
0
.
7
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Haman
o
r
e
rere should not repeat th
e
earlier
h
u
n
k
s in l
a
ter
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-02
J
unio C Hamano
Hop
e
fully f
i
nal upda
t
e t
o
the draft
R
elease Note
s
,
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-04-01
Juni
o
C Hamano
Op
t
io
n
al Tck/Tk
:
ignore generated files
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Ha
m
ano
Do not
b
othe
r
document
i
ng fetch--tool
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hama
n
o
Upda
t
e
draft
releas
e
notes for 1
.
5
.
1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-30
Junio C H
a
man
o
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-03-30
Junio
C
Hamano
Merge b
r
anch 'master' of gi
t
://repo
.
or
.
cz/git
/
me
r
getool
.
g
i
t
commit
|
commitdiff
|
tree
2007-03-28
Juni
o
C Hamano
Documentation: unbreak use
r
-ma
n
ua
l
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Ju
n
io C
Hama
n
o
G
I
T
1
.
5
.
1
-rc3
commit
|
commitdiff
|
tree
2007-03-28
Ju
n
i
o
C
Ha
m
ano
Update main git
.
h
tml page
t
o point a
t
1
.
5
.
0
.
6 do
c
umentation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
Merg
e
br
a
nch
'maint' to sync
h
ro
n
ize
wit
h
1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C H
a
m
a
no
GIT 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
J
unio
C
Hamano
Fix "--pretty=format:" for parent
r
elated items
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-28
Junio C
H
a
ma
n
o
git-commit: "re
a
d-tree -m HEAD" is
n
ot
the rig
h
t wa
y
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
Junio C Ha
m
ano
sha1_file
.
c (wr
i
te_sha1_file): D
e
tect close fail
u
re
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-27
J
u
n
i
o C
H
am
a
no
Docu
m
ent git
-
log --first-parent
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-26
Junio C H
a
mano
GIT 1
.
5
.
1-r
c
2
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-26
Juni
o
C Ha
m
ano
M
e
rge br
a
nch 'jc/f
p
l'
commit
|
commitdiff
|
tree
2007-03-26
Junio C Ha
m
ano
Upda
t
e README to poi
n
t at a few
key periodical messages
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-25
Junio
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-03-25
Junio C Hamano
Merge branc
h
'ma
i
nt' of
g
it://linux-nfs
.
org/~bfiel
d
s
.
.
.
commit
|
commitdiff
|
tree
2007-03-25
Jun
i
o
C H
a
mano
Merge branch 'js/
r
emote-sh
o
w-push'
commit
|
commitdiff
|
tree
2007-03-25
Junio C Hama
n
o
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-03-24
Junio C Hamano
git-
a
m d
o
cumentation:
describe wha
t
is taken from
w
he
r
e
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-24
Junio C
Hamano
m
ak
e
the pre
v
ious optim
i
zation work also on path-limited
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-24
Junio C
H
amano
rev-list --
b
i
sect: Fix "halfway" op
t
imi
z
ation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-24
Ju
n
io C Hamano
Mer
g
e branch '
m
aster' int
o
j
c
/
b
isect
commit
|
commitdiff
|
tree
2007-03-24
Junio C
H
amano
Me
r
ge
b
ra
n
ch 'main
t
'
commit
|
commitdiff
|
tree
2007-03-24
Ju
n
i
o
C
Hamano
Fix path-limited
"
rev-list --bisect
"
termination condition
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-23
Junio
C
Hama
n
o
g
it-
b
i
sect
.
sh: properly dq $GIT_DIR
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-23
Junio C Hama
n
o
git-bisect: ty
p
of
i
x
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-23
Junio C Hama
n
o
ch
e
ckout: report
w
here
t
he new HEAD
i
s
upon
d
e
t
aching
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-23
Junio C Hamano
t6004: add a b
i
t more path
o
p
t
imizati
o
n test
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-23
Junio C H
a
mano
gi
t
-apply: Do not free the
w
rong buffer when we
convert
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-22
J
u
nio
C
Hamano
Merge git://git2
.
kernel
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2007-03-22
Junio C
Ham
a
n
o
Merge
b
r
a
nch
'
ma
i
nt
'
commit
|
commitdiff
|
tree
2007-03-22
Junio
C
Hamano
git-r
e
base: make 're
b
a
s
e HEAD branch' work as expected
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-22
Junio C Hamano
git-rev-list --bisect: 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
Ju
n
io C
Haman
o
t6002: minor spelling fix
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-22
Junio C Hamano
tr
e
e_e
n
try_intere
s
ting(): allow i
t
to say "everything
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-22
Junio C Hamano
tre
e
-di
f
f: avoid strncmp()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-22
Junio C
H
amano
Teac
h
tree_
e
n
try_in
t
eresti
n
g() that the tre
e
en
t
r
i
es
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-21
Junio C Hama
n
o
b
l
ame:
cmp_suspect is not "cmp" an
y
more
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-20
Juni
o
C Ha
m
ano
Me
r
ge git://git2
.
kernel
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2007-03-20
Ju
n
io C Ham
a
no
blame:
m
icro-optimize cmp_suspe
c
t()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-19
Ju
n
io
C Hamano
GIT 1
.
5
.
1-rc1
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-19
Junio C Haman
o
F
i
x
m
er
g
e-index
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2007-03-19
J
u
ni
o
C
Hamano
Me
r
g
e branch 'jb/gc'
commit
|
commitdiff
|
tree
next