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
J
unio C Hamano
merge-recursiv
e
:
d
o no
t
ba
r
f on "to be removed
"
en
t
r
ies
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
u
nio C Hamano
Trea
t
D/F conf
l
ict entry mo
r
e c
a
reful
l
y
in unpack-trees
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
Junio C Hamano
t10
0
0
: fix case
t
abl
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio C
H
amano
Mer
g
e branch
'
jc/push'
commit
|
commitdiff
|
tree
2007-04-09
Ju
n
io
C Hamano
Merge branch
'
jc/merge-sub
t
ree'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio C Hamano
Mer
g
e branc
h
'
js/fe
t
c
h-progress
'
commit
|
commitdiff
|
tree
2007-04-09
Junio C H
a
m
a
no
Merge
b
r
a
nch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
Juni
o
C
Hamano
A
dd Docu
m
e
ntation/
c
md-l
i
st
.
ma
d
e to
.
gitignor
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Start 1
.
5
.
2 c
y
cle by prepareing R
e
l
N
o
tes for i
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Junio C Ham
a
no
Merge branch
'
jc/read-tree-df'
(early part)
commit
|
commitdiff
|
tree
2007-04-08
Junio
C
Haman
o
Mer
g
e branch 'm
a
int'
commit
|
commitdiff
|
tree
2007-04-08
Jun
i
o
C
Ha
m
an
o
Prepare for 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
unio C H
a
mano
A
new merge str
a
gety 'subtree'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
i
o
C Hamano
git-pu
s
h to multiple locations do
e
s not
stop at
the
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C H
a
mano
git-p
u
sh
reports the
URL afte
r
fa
i
ling
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
J
unio C Ha
m
a
no
Merge branc
h
'j
c
/index-output'
commit
|
commitdiff
|
tree
2007-04-07
Junio
C
Hamano
M
e
rge branch 'fp
/
make-j'
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
mano
Merge branch '
c
c/bisect'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merge branch
'jc/che
c
kout' (early part)
commit
|
commitdiff
|
tree
2007-04-07
Junio C
Hama
n
o
Mer
g
e
branc
h
'maint'
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Ha
m
ano
Do
c
umentation: tighten dependenc
y
for git
.
{ht
m
l,txt}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
m
a
no
gi
t
-bisect: allo
w
bi
s
ectin
g
wi
t
h on
l
y one bad commit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Hama
n
o
t60
3
0: add a bit mo
r
e tests to
gi
t
-bisect
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Junio C Ha
m
a
no
g
i
t-bisect: mode
r
nizat
i
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C Hamano
Merge
b
r
a
nch 'main
t
'
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
R
e
name
a
dd_file_to_index() to
a
d
d_file_to
_
ca
c
h
e()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
J
u
nio
C
Hamano
R
ename s
t
atic
v
a
riable write_
i
n
d
e
x to upd
a
te_index
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Rena
m
e internal function "add_
f
ile_to_cache"
i
n builti
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Prop
a
g
a
te ca
c
he error inter
n
a
l
to refresh_cache() via
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C
Hamano
Fix bogus error message from merge-re
c
ursive error
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
F
ix dependency of common-cmds
.
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
RPM spec: i
n
clude git-p4 in th
e
list
o
f all packages
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
n
io
C
Ha
m
a
no
r
erere: make
s
o
r
ting really sta
b
le
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
H
a
m
an
o
Fix
switc
h
ing to a branc
h
with
D/F when current bran
c
h
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C H
a
mano
Fix twoway
_
merge
t
hat passed d/f
c
o
nflict marker to
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
J
unio C
Hamano
Fix
r
e
ad-tree --prefix=dir/
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C Haman
o
u
n
pa
c
k-t
r
ees:
get rid of *indpos param
e
ter
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C H
a
m
ano
unpack_t
r
ees
.
c: pass un
p
ack_trees_options str
u
cture
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Hamano
ad
d
_cache_
e
ntry()
:
removal
o
f
file foo d
o
es not conflict
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C Hamano
M
e
rge branch
'
jc/bi
s
ect'
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o
C
H
a
mano
M
erge br
a
nch 'fl/d
o
c
'
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C
Hamano
Merge bra
n
ch 'pos
t
1
.
5
.
1
/b
l
ame
.
el
'
commit
|
commitdiff
|
tree
2007-04-04
Junio
C Haman
o
M
erge branch 'pos
t
1
.
5
.
1/tcl
t
k'
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C Hamano
Merge branch 'post1
.
5
.
1/p4'
commit
|
commitdiff
|
tree
2007-04-04
J
unio C Hamano
M
erge
branch 'lt
/
dirwalk'
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C
H
amano
git-read-tree --
i
ndex-output=<file>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
amano
_GIT_INDEX_OU
T
PUT: allow plu
m
bing to output to an al
t
e
rnativ
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
unio
C
Hamano
checko
u
t:
allow detaching to HEAD even when switching
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio 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 Ham
a
n
o
M
e
r
ge 1
.
5
.
0
.
7
i
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
Hamano
GI
T
1
.
5
.
0
.
7
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C Hamano
r
e
r
ere should not re
p
eat
t
h
e
ear
l
ie
r
hunks in later
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-02
Junio C Hamano
H
opef
u
l
ly fi
n
al update to
the draft Release Notes,
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
Junio C Hamano
Optio
n
al Tck/
T
k: i
g
nore generat
e
d fil
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Ham
a
n
o
Do not
bother do
c
um
e
nt
i
n
g
f
e
tch--tool
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Ju
n
io C Hamano
Update draft release notes for 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Hamano
M
e
rge
br
a
nch '
m
aint'
commit
|
commitdiff
|
tree
2007-03-30
Junio C
Ham
a
no
Merge bran
c
h 'ma
s
t
er
'
of git://repo
.
or
.
cz/
g
it/mergetool
.
git
commit
|
commitdiff
|
tree
2007-03-28
Junio C Ha
m
ano
D
ocum
e
ntatio
n
: unbre
a
k user-
m
a
nual
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
G
I
T
1
.
5
.
1
-rc3
commit
|
commitdiff
|
tree
2007-03-28
Juni
o
C Haman
o
Up
d
at
e
main git
.
html
p
a
ge to point at 1
.
5
.
0
.
6
d
ocumentation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Jun
i
o
C
Ha
m
ano
Merge branch 'maint' to synchron
i
ze
with
1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
J
u
n
i
o
C Hamano
GIT 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Ju
n
i
o
C
H
amano
Fix "--pretty=f
o
rm
a
t:"
f
or parent related items
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
git-commit: "rea
d
-tree
-m HEAD" is no
t
th
e
right
way
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Jun
i
o C
H
a
m
ano
sha1_file
.
c (write_sh
a
1_file
)
: Detect close fai
l
ure
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Junio
C
H
a
mano
Document
g
it-log --first-parent
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Jun
i
o C Hamano
GIT
1
.
5
.
1-rc2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Juni
o
C Ham
a
no
Merge
branch '
j
c/fpl
'
commit
|
commitdiff
|
tree
2007-03-26
Junio C Hama
n
o
Update
README to po
i
nt
at a few key periodical messages
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
J
u
nio C Haman
o
Mer
g
e
branch 'main
t
'
commit
|
commitdiff
|
tree
2007-03-25
Junio C Hamano
Me
r
ge branch 'maint'
of g
i
t://li
n
ux-nfs
.
o
r
g/~bf
i
el
d
s
.
.
.
commit
|
commitdiff
|
tree
2007-03-25
Junio C Hamano
Merge bran
c
h 'js/rem
o
te-show-push'
commit
|
commitdiff
|
tree
2007-03-25
Junio C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-03-24
Junio C Hama
n
o
g
i
t-am docume
n
ta
t
ion: describe what is
t
ak
e
n f
r
om
w
here
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Ju
n
io C Hamano
make the previous optimization work a
l
so on path-limited
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Juni
o
C Hamano
rev-list --bis
e
c
t
:
F
ix "h
a
lfway" optimizat
i
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
J
unio C
H
amano
M
e
rge branch 'mas
t
er' into jc/bis
e
ct
commit
|
commitdiff
|
tree
2007-03-24
Junio
C Ha
m
a
no
Merge
bran
c
h 'main
t
'
commit
|
commitdiff
|
tree
2007-03-24
Junio C Hamano
Fix pa
t
h-limite
d
"rev-list --b
i
s
e
ct" ter
m
i
nation c
o
n
d
itio
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Jun
i
o
C
H
a
mano
git-bisect
.
s
h
: properly dq $GIT_D
I
R
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Junio C Hamano
git
-
bisect:
t
ypofix
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Junio C Hamano
checkout: report
w
he
r
e
t
he ne
w
HE
A
D
i
s upon detaching
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Junio C
H
amano
t
6
0
0
4
: add a
b
it
m
o
r
e path optimization test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Junio C Ham
a
no
git-app
l
y: Do not fr
e
e
t
he wrong buffer
w
hen
we con
v
ert
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio C Hamano
Me
r
g
e g
i
t://gi
t
2
.
kernel
.
o
rg/pub/scm
/
gitk/gitk
commit
|
commitdiff
|
tree
2007-03-22
Junio C Ham
a
no
Merge
b
ra
n
ch '
m
aint'
commit
|
commitdiff
|
tree
2007-03-22
Junio C Hamano
git-rebase: m
a
ke 'reb
a
se HEAD branch' work as expe
c
ted
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Jun
i
o C Hamano
g
i
t-re
v
-lis
t
--
b
isect: optimizati
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio
C Hamano
git-rev-list: a
d
d
--b
i
s
e
ct-vars option
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Ju
n
io C Hamano
t6002: minor
spelling fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio C Ha
m
ano
tree_e
n
try_interesting
(
)
: allow it to s
a
y
"
everythi
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio
C
Ha
m
ano
tree-diff
:
avoid strncmp()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio C Ha
m
ano
Teach tree_entry_
i
nteresting() th
a
t
t
h
e
tree entries
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-21
J
unio C
H
a
m
ano
blame: cmp_suspect is no
t
"cmp" anymore
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-20
Junio C Hama
n
o
Merge
g
it://git2
.
kerne
l
.
o
r
g
/pub/scm/g
i
tk/gitk
commit
|
commitdiff
|
tree
2007-03-20
Junio C
Hamano
blame: mic
r
o
-optimize cmp_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
-
index
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-19
J
u
n
i
o C
H
amano
Merge b
r
anch 'j
b
/gc'
commit
|
commitdiff
|
tree
next