repo.or.cz
/
git
/
jnareb-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 'jc/the-index'
2007-04-09
Junio
C
Hamano
Me
r
ge branch 'jc/push'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Merge bran
c
h 'j
c
/merge-subtree'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio C H
a
m
a
no
Mer
g
e branch 'js/fetch-progress'
commit
|
commitdiff
|
tree
2007-04-09
Junio C
Hamano
M
erge branch
'
m
a
i
nt'
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Add Docu
m
entation/cmd
-
list
.
made to
.
gitign
o
re
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
J
unio
C Ha
m
ano
Sta
r
t
1
.
5
.
2 cycle by
prepareing RelNo
t
es for it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
M
e
rge br
a
n
ch 'j
c
/read-tree-df' (earl
y
part)
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hama
n
o
M
e
rge branc
h
'
m
aint'
commit
|
commitdiff
|
tree
2007-04-08
Junio C Haman
o
Prepare for 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hama
n
o
A new merge stragety 'subtree'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
uni
o
C Hamano
git-pu
s
h to multiple locations doe
s
n
o
t stop at the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C Hamano
g
it-push reports
the
URL after f
a
iling
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C
Hamano
Merge branch 'jc/
i
ndex
-
out
p
ut
'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge b
r
anch 'fp/ma
k
e-j'
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
m
a
n
o
Merge branch 'c
c
/bise
c
t
'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge branch 'jc/check
o
ut' (ea
r
ly par
t
)
commit
|
commitdiff
|
tree
2007-04-07
J
unio C Ha
m
ano
M
e
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
D
ocumentatio
n
: t
i
ghten depen
d
ency for git
.
{html,txt}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
unio C
Hamano
git-bis
e
ct: allow bisecti
n
g
with only one bad commit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
mano
t
6030: add a bit mo
r
e
tests
to
git-bis
e
ct
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Junio C Hamano
g
i
t-bisect:
m
od
e
rniz
a
tion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Ju
n
io C Hama
n
o
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2007-04-05
J
u
n
i
o
C Hamano
Rename add_file_to_index(
)
to
a
dd_file_
t
o_cache()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Ju
n
io C
H
amano
Rename static
v
a
r
iabl
e
write_index to up
d
ate_index
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
R
e
name int
e
rnal
f
unc
t
ion "
a
dd_
f
i
l
e_to_cach
e
"
in built
i
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C
H
a
m
ano
Propagate
c
a
ch
e
err
o
r int
e
rnal to refresh_cache() via
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C
H
am
a
no
F
ix bogu
s
e
r
ror messa
g
e from merge-r
e
c
u
r
sive error
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
J
unio 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 Hamano
RP
M
spec:
i
n
clude
g
it-
p
4 in
t
he list of all packages
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Hama
n
o
rerere: mak
e
sorting re
a
lly stable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Fix
switc
h
ing to a branch with
D
/F
when
c
u
rrent branch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C Hamano
Fix twowa
y
_merge that pass
e
d d/f conf
l
ict marke
r
to
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
J
unio C Hama
n
o
Fix read-t
r
ee --prefix=dir/
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C Ha
m
a
no
unpack-trees:
g
e
t
rid of *ind
p
os parameter
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
unio C Hamano
unpack
_
trees
.
c:
p
a
ss unpack_tr
e
es_opt
i
ons str
u
cture
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Hama
n
o
add_cach
e
_entry(): r
e
moval of file
foo does not conf
l
ict
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C
H
amano
Merg
e
branch 'jc/bi
s
e
c
t'
commit
|
commitdiff
|
tree
2007-04-04
J
u
n
io C Hamano
M
e
rge branc
h
'fl/doc'
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Hamano
Merge branch 'post1
.
5
.
1/
b
lame
.
e
l
'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge branch 'po
s
t1
.
5
.
1/tc
l
tk'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Haman
o
Merge
branch 'post1
.
5
.
1/
p
4'
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Hamano
Merge br
a
nch 'lt/
d
irwalk'
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C
Hamano
git-re
a
d-tr
e
e --inde
x
-out
p
ut
=
<file>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
H
a
mano
_GIT_INDEX
_
OUTPU
T
: allow plumbing
t
o out
p
ut to
an alternativ
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
chec
k
out:
all
o
w detachin
g
to
H
EAD even w
h
e
n
s
w
itching
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Haman
o
G
I
T 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Hamano
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 Hamano
GIT
1
.
5
.
0
.
7
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C H
a
mano
rere
r
e
should
not
repeat the earlier hunks in
l
ater
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-02
Junio C
H
amano
H
opefully final update to the draft Release No
t
es,
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
J
unio C
H
a
mano
O
p
tiona
l
Tck/Tk:
i
gnore gener
a
t
e
d fi
l
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
Do
not both
e
r documen
t
ing fetch--tool
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Ha
m
ano
Update draft
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
Merge branch 'mai
n
t
'
commit
|
commitdiff
|
tree
2007-03-30
J
unio
C Ham
a
no
Me
r
ge b
r
anch
'
master' of g
i
t://repo
.
or
.
cz/git/mergetoo
l
.
git
commit
|
commitdiff
|
tree
2007-03-28
Junio C
H
a
m
a
no
Docum
e
nt
a
tion:
un
b
reak 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
Junio C Ha
m
ano
U
p
date
m
ai
n
g
it
.
html page to point at 1
.
5
.
0
.
6 documentation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Ju
n
io C Hamano
Merge branch 'maint' to sy
n
chronize with 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
J
unio C H
a
mano
G
I
T 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C
Hamano
Fix "--pretty=format:" for par
e
n
t
related i
t
ems
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
J
un
i
o C Ham
a
n
o
git-c
o
mmit: "read-t
r
ee -m HEAD" is not the right way
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Junio
C
Hamano
sha1_fi
l
e
.
c (write
_
sha1_file)
:
D
e
tect
close failure
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
J
u
nio C H
a
mano
D
oc
u
ment 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
Hamano
Merge
b
r
anch 'jc
/
fpl
'
commit
|
commitdiff
|
tree
2007-03-26
J
u
nio
C
Hamano
Update README to point at
a
few key p
e
r
i
o
dical messages
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
Junio C
H
aman
o
Merge bran
c
h
'maint'
commit
|
commitdiff
|
tree
2007-03-25
Juni
o
C Hamano
Merge branch
'
ma
i
nt' of git://linux-nfs
.
org/~
b
fields
.
.
.
commit
|
commitdiff
|
tree
2007-03-25
Junio C Hamano
Mer
g
e branch 'js/remo
t
e-show-push'
commit
|
commitdiff
|
tree
2007-03-25
J
u
nio C Haman
o
M
e
rge branch 'ma
i
n
t'
commit
|
commitdiff
|
tree
2007-03-24
Junio C Hama
n
o
git-am documentation
:
describe
what is ta
k
en from where
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Jun
i
o C Hamano
mak
e
the previous optim
i
zat
i
on work al
s
o on path
-
limited
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Junio C H
a
mano
rev-list --bis
e
c
t
:
Fix "halfw
a
y" opt
i
mi
z
ation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Junio C Hamano
Merge branch 'master' into jc/bisect
commit
|
commitdiff
|
tree
2007-03-24
Junio C
Hamano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2007-03-24
Junio C Hamano
F
ix path-limited "rev-list --bisect" termina
t
ion conditio
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Juni
o
C Ham
a
no
git-bisect
.
sh: pr
o
perly dq $G
I
T_DIR
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Junio
C
H
a
ma
n
o
git-b
i
sect
:
typ
o
f
ix
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Junio C Hama
n
o
check
o
ut: report w
h
ere the
new
HEA
D
is upon d
e
ta
c
hing
.
.
.
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
ptimiz
a
t
ion test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
J
unio C Hamano
git-apply: Do not free
t
he wro
n
g
b
uff
e
r
w
he
n
we
co
n
vert
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio
C
Hamano
Merge git://git
2
.
k
e
rnel
.
org/pu
b
/scm/gitk/gitk
commit
|
commitdiff
|
tree
2007-03-22
Junio C Hamano
Me
r
g
e bran
c
h 'maint'
commit
|
commitdiff
|
tree
2007-03-22
Junio C Hamano
g
it
-
rebase:
make
'
re
b
ase HEA
D
b
r
anch
'
work
a
s expected
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
J
unio C
H
am
a
no
git-rev-l
i
st --bisect
:
optim
i
zation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio C Hamano
g
i
t-
r
ev-li
s
t: a
d
d
-
-
bisect-vars
o
p
t
i
on
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio C Hamano
t6002: m
i
n
o
r spelli
n
g f
i
x
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Jun
i
o
C Hamano
tree_entry
_
i
nterestin
g
(): allow
it to
say
"e
v
eryt
h
i
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Juni
o
C H
a
ma
n
o
tree-
d
if
f
: avo
i
d str
n
cm
p
(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Jun
i
o C
H
amano
Teach tree
_
entry_interesting() that the
t
ree en
t
ries
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-21
J
u
n
io C Hamano
blame: cmp_sus
p
ect is not "cmp" anymo
r
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-20
Jun
i
o
C
Hamano
Merge
git:
/
/git2
.
ke
r
nel
.
org/pub/scm
/
gitk/gitk
commit
|
commitdiff
|
tree
2007-03-20
Junio
C
Hamano
blam
e
:
mi
c
ro-optimize cmp_
s
uspect()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-19
Junio C Hamano
G
IT 1
.
5
.
1
-
rc1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-19
J
u
n
i
o C Hamano
Fix merge-i
n
de
x
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-19
Junio C Hama
n
o
Mer
g
e bra
n
ch 'jb/gc'
commit
|
commitdiff
|
tree
2007-03-19
Junio C Hamano
Merge branch 'fl/cvsserver'
commit
|
commitdiff
|
tree
2007-03-19
Junio C Hamano
Merge branch 'sp/run-comma
n
d'
commit
|
commitdiff
|
tree
2007-03-18
Junio C Ha
m
ano
Update main gi
t
.
h
tml
page to
p
oint at 1
.
5
.
0
.
5 documenta
t
ion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next