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
Jun
i
o C
Hamano
m
erge-recursive: do not barf o
n
"to be removed" en
t
ries
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C H
a
m
a
no
Treat D/F co
n
flict en
t
r
y more carefully i
n
unpack-tree
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
unio C H
a
m
a
no
t1000: fix case table
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Ha
m
ano
Mer
g
e branch
'jc/push'
commit
|
commitdiff
|
tree
2007-04-09
Ju
n
io C Ha
m
ano
M
er
g
e branch 'jc
/
merge-subtree'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Ha
m
ano
Merge branch 'j
s
/fe
t
ch
-
p
rog
r
ess'
commit
|
commitdiff
|
tree
2007-04-09
Junio C H
a
mano
M
erge
branch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Add D
o
cumentation/cmd-l
i
st
.
made to
.
gitignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Junio C
Hamano
Star
t
1
.
5
.
2
c
ycle by prepareing RelN
o
tes fo
r
it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Ju
n
io C Hamano
Merge branch 'jc
/
read-tree-df' (ear
l
y part)
commit
|
commitdiff
|
tree
2007-04-08
Jun
i
o
C Hama
n
o
Merge br
a
nc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-08
J
u
nio 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
Ju
n
io C
H
a
m
ano
A n
e
w merge strag
e
ty 'subtree
'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
g
it
-
push to m
u
l
tiple lo
c
ations does
n
ot s
t
op at
the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C H
a
mano
git-push reports the URL a
f
ter failing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ham
a
no
Merge branch 'jc/index-outp
u
t'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merg
e
branc
h
'
fp/make-j'
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
Hamano
M
er
g
e
b
ran
c
h
'
cc/bise
c
t'
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
m
a
no
Merg
e
branc
h
'jc/c
h
eckou
t
'
(early par
t
)
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
mano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Documentation: tighten
d
ependen
c
y for
git
.
{
h
tml,
t
xt}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
u
nio C Hama
n
o
g
it-bi
s
ect: allow bisecting with o
n
ly one bad commit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
u
n
io C H
a
m
ano
t603
0
: add a bit mor
e
t
ests to git-
b
isect
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Junio C Ha
m
ano
git-
b
i
sect: m
o
dernizatio
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Me
r
ge bra
n
c
h 'maint'
commit
|
commitdiff
|
tree
2007-04-05
J
u
nio C Haman
o
Rename add_f
i
le
_
to_index() to add_file_to_cache()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Re
n
ame stati
c
variable w
r
ite
_
index to update_index
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C Hamano
R
e
name
internal
function "a
d
d
_file
_
t
o_cache" in builtin
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Ju
n
io
C
Ham
a
n
o
Propaga
t
e cache error in
t
ernal to refresh_cache() via
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Juni
o
C Hamano
F
ix
b
og
u
s error message from m
e
r
g
e
-recursive error
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C H
a
man
o
Fix depen
d
ency
of
c
o
m
m
o
n-cmd
s
.
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
RP
M
spec: i
n
c
lud
e
g
it-
p
4
in the l
i
st of al
l
p
a
c
k
ages
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C Ham
a
no
rere
r
e: make sorting real
l
y stable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Hamano
Fix sw
i
tching
to a
bra
n
ch
with D/
F
when c
u
rrent branch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ham
a
no
Fix twoway_merge that passed d/f confli
c
t
marker to
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
Junio
C Hamano
Fix read-
t
ree --prefix=dir/
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Hamano
unpack-tree
s
: get ri
d
of *indpos parameter
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio
C
H
am
a
no
unpack_trees
.
c
:
p
a
ss
unpack_tree
s
_opti
o
ns
structure
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C Hamano
add_cach
e
_
e
nt
r
y(): r
e
moval of file foo does not conf
l
ic
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ha
m
ano
Merge bra
n
c
h
'jc/b
i
sect'
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Ha
m
ano
Merge branch 'fl/do
c
'
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
amano
Merge
b
ranch '
p
ost1
.
5
.
1/blame
.
e
l'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge branc
h
'po
s
t1
.
5
.
1/tcltk'
commit
|
commitdiff
|
tree
2007-04-04
Junio
C Hamano
Mer
g
e
bra
n
ch 'post1
.
5
.
1
/
p4'
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Hamano
Me
r
ge branch
'lt/di
r
w
a
lk'
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Ha
m
a
n
o
gi
t
-read-tree --index-output=<
f
ile>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C H
a
mano
_GIT_INDEX_OUTPUT:
a
llow p
l
um
b
i
n
g to
o
utput t
o
an alternativ
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
che
c
kout: allow detac
h
ing t
o
H
EAD even when switching
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
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
J
unio 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
rere
r
e s
h
o
u
ld not repeat the
e
arlier h
u
n
ks i
n
later
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-02
Junio C Hamano
Hopefully final u
p
date to the draft Release Notes,
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
Junio C Hamano
Optional Tck/Tk:
ig
n
o
re gener
a
ted files
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Ham
a
no
Do n
o
t bother documenting fetch--tool
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Ham
a
no
Update
dra
f
t release notes for 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Ham
a
no
Merge bra
n
ch 'main
t
'
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
Merge branch 'ma
s
ter' of git
:
/
/repo
.
or
.
cz/git/mergetoo
l
.
git
commit
|
commitdiff
|
tree
2007-03-28
Junio C Ha
m
ano
D
o
cumenta
t
i
on: un
b
reak user
-
man
u
al
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
J
u
n
i
o C Ham
a
no
GIT 1
.
5
.
1-rc3
commit
|
commitdiff
|
tree
2007-03-28
J
unio C Hamano
Upda
t
e main gi
t
.
html page to
point at 1
.
5
.
0
.
6 docu
m
e
ntation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
J
u
nio C Hamano
Merge b
r
a
n
ch '
m
ai
n
t
'
to synchron
i
ze
w
ith
1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
GIT 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C
Hamano
Fix "-
-
pretty=
f
ormat:" fo
r
parent related items
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C H
a
mano
git-commit: "read-tree
-
m H
E
AD" is not th
e
righ
t
way
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Junio C
Hamano
sha1_fil
e
.
c (write_s
h
a1_fil
e
): Detect close failure
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Junio C Hamano
D
ocu
m
ent git-log --first-parent
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Junio
C Hamano
G
I
T
1
.
5
.
1-rc
2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Juni
o
C Hamano
M
erge b
r
anch 'j
c
/fpl'
commit
|
commitdiff
|
tree
2007-03-26
Junio C
Hamano
Updat
e
README to
p
oint at
a
few k
e
y periodical messages
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
Junio C Hamano
M
e
rge br
a
n
ch
'
maint'
commit
|
commitdiff
|
tree
2007-03-25
Junio C Haman
o
Merge
b
ra
n
ch 'maint' of gi
t
://linux-nfs
.
org/~bfields
.
.
.
commit
|
commitdiff
|
tree
2007-03-25
J
unio C Ham
a
no
Merge bra
n
c
h
'js/re
m
o
t
e-show-push'
commit
|
commitdiff
|
tree
2007-03-25
J
u
nio C H
a
m
a
n
o
Merge
br
a
nch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-03-24
Junio C H
a
ma
n
o
git-am docume
n
t
a
tion: desc
r
ibe what is ta
k
en fr
o
m where
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Juni
o
C Ha
m
ano
make the pre
v
ious
o
ptimization work a
l
so on path-limited
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Jun
i
o C Hamano
rev-list --bisect: Fix "halfway
"
optimiz
a
tion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Junio
C
H
amano
Merge
b
ranch
'
m
aster
'
into jc/bi
s
ect
commit
|
commitdiff
|
tree
2007-03-24
Junio C
Hamano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2007-03-24
Junio C Ha
m
ano
F
i
x
path-
l
imi
t
ed "rev-list --b
i
sect" termination cond
i
tio
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Junio
C Hamano
g
i
t-bis
e
ct
.
sh: properly dq
$
GIT_D
I
R
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
J
u
n
i
o C
H
amano
git-bisect: typof
i
x
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Junio C Hamano
chec
k
out: report
where the new HEAD is upon detaching
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Junio
C
H
amano
t
6004
:
add a bit more pat
h
optimization
test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Junio C Hamano
git-apply: Do not
free the wro
n
g buffer when
w
e conv
e
rt
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Ju
n
io C Ham
a
no
Merg
e
g
i
t://
g
it
2
.
kerne
l
.
org/pub
/
scm/gitk/gi
t
k
commit
|
commitdiff
|
tree
2007-03-22
Juni
o
C Hamano
Merge branch 'm
a
i
nt'
commit
|
commitdiff
|
tree
2007-03-22
Jun
i
o C Hama
n
o
git-re
b
ase:
make '
r
ebase HE
A
D
branch'
work
a
s expected
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Juni
o
C Hamano
git-
r
ev-lis
t
--bisect: optimi
z
ation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio
C Ha
m
an
o
git-rev-list: add --bisect-v
a
rs option
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio C Ham
a
no
t6002: minor sp
e
l
l
i
ng fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio C Hamano
tree_e
n
try_interesti
n
g(): allo
w
it to say
"
e
v
er
y
thing
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Juni
o
C Hamano
tree-diff: avoid st
r
n
c
mp()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Jun
i
o C Ha
m
ano
Tea
c
h
tree
_
e
ntry_interesting()
t
hat
t
he tree
e
ntries
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-21
Ju
n
i
o C Haman
o
blame: cmp_suspec
t
is not "cmp
"
anym
o
re
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-20
J
u
nio C Hamano
Merge
git://git2
.
kernel
.
org/pub/scm/gitk/
g
i
t
k
commit
|
commitdiff
|
tree
2007-03-20
Junio C Haman
o
blame: micro-opt
i
m
i
z
e c
m
p_suspect()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-19
Junio C Hamano
GIT 1
.
5
.
1
-rc1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-19
Junio C Hamano
F
i
x merge-
i
ndex
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-19
Jun
i
o
C Ham
a
no
Mer
g
e branc
h
'jb/gc'
commit
|
commitdiff
|
tree
next