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
Treat D/F conflict entry more carefully in unpack-trees.c::threeway_merge()
2007-04-10
Junio C Hamano
Treat
D
/
F
conflict e
n
try more
care
f
u
l
l
y
in unpack-tr
e
es
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-10
J
u
nio
C H
a
mano
t
1
0
0
0:
fix ca
s
e table
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Junio C
H
amano
Merge branc
h
'jc/
p
u
sh'
commit
|
commitdiff
|
tree
2007-04-09
Jun
i
o C Ha
m
ano
M
e
rge branch 'jc
/
m
erge-subtree'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-09
Juni
o
C H
a
mano
Merge branc
h
'
j
s
/fetch-progress'
commit
|
commitdiff
|
tree
2007-04-09
J
unio C Haman
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-04-09
J
unio
C Hamano
Add
D
ocumentat
i
on/cmd-list
.
mad
e
to
.
gitignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
J
u
nio C Hamano
Sta
r
t 1
.
5
.
2 cy
c
le by preparei
n
g RelNotes for
it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-08
Juni
o
C
H
am
a
no
Merge branch 'jc/read-tree
-
df' (early part)
commit
|
commitdiff
|
tree
2007-04-08
Junio C Ha
m
a
no
Merge branch
'
maint
'
commit
|
commitdiff
|
tree
2007-04-08
Junio C Hamano
Prepa
r
e f
o
r 1
.
5
.
1
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
mano
A new merge s
t
rage
t
y 'subtree'
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Ju
n
io C Hamano
git-p
u
sh
t
o
multiple loca
t
i
ons d
o
e
s
n
o
t
stop at t
h
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Jun
i
o C
H
amano
g
it-push report
s
the UR
L
after failing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Juni
o
C Haman
o
Me
r
ge branch '
j
c/in
d
ex-outpu
t
'
commit
|
commitdiff
|
tree
2007-04-07
J
unio C Ha
m
ano
Merge branch 'fp/make-j'
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
Merg
e
branch 'cc/bisect'
commit
|
commitdiff
|
tree
2007-04-07
Junio C H
a
mano
M
e
rge branch 'jc/
c
heckout'
(
early part)
commit
|
commitdiff
|
tree
2007-04-07
Junio C
H
amano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-04-07
J
u
n
io C Hamano
Documen
t
ation
:
tighten dependency for git
.
{html,
t
xt}
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Hamano
g
it-bis
e
ct: all
o
w b
i
secti
n
g with only one bad commit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-07
Junio C Ham
a
no
t6030: add a bit more tests to git-bisect
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-06
Jun
i
o C Hamano
git-bise
c
t: modernization
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
J
u
nio C
H
am
a
no
Me
r
ge
b
ranch '
m
aint'
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Rename
add_
f
ile_to_index()
to add_fi
l
e_to_cache()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C
H
amano
Rename static varia
b
l
e write_index to
u
p
d
a
te_i
n
dex
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Ju
n
i
o
C Ha
m
ano
Rena
m
e internal functi
o
n
"add_f
i
le_to_cache" in bu
i
lt
i
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio
C
Hamano
Propagate cac
h
e erro
r
intern
a
l to refresh_cache() via
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Ju
n
io C Hamano
Fix bogus error
m
e
ssage fr
o
m
mer
g
e-
r
ecur
s
ive erro
r
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-05
Junio C Hamano
Fix dependency of common-c
m
ds
.
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C
H
a
man
o
RPM spec: include
git-
p
4 in the
l
i
st
o
f all
p
ackag
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
rere
r
e: mak
e
s
o
rting really stable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hama
n
o
Fix swi
t
ch
i
n
g to a branch with D/F when current branch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Ha
m
ano
Fix twoway_merge that passe
d
d/f c
o
n
flict marker
t
o
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Hamano
Fix read-tr
e
e --prefix=dir/
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
unpack-trees: get
r
id 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
unpack_trees_options s
t
ructure
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Hamano
add_cache_entry():
remo
v
al
of
f
i
le foo
d
o
es
not
c
onfli
c
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge
branch
'jc/bisect'
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C Ham
a
n
o
Merge
b
r
anch '
f
l
/
d
o
c'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hama
n
o
Merge branch 'p
o
st1
.
5
.
1/blam
e
.
el
'
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Hamano
Merge branc
h
'post1
.
5
.
1/
t
clt
k
'
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Ha
m
ano
Merge branc
h
'post
1
.
5
.
1/p4
'
commit
|
commitdiff
|
tree
2007-04-04
Junio
C Hamano
Merge branch 'lt/dirwa
l
k'
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
a
mano
git-re
a
d-tree --index-output=<file>
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
a
m
a
n
o
_GIT_IN
D
EX_OUT
P
UT: allow plumb
i
n
g
to output to an alternativ
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
i
o
C
H
amano
c
heckou
t
: allow detaching to
HEAD even
w
hen switc
h
in
g
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Hamano
GIT 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Me
r
ge 1
.
5
.
0
.
7 in
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
unio C Hamano
G
I
T 1
.
5
.
0
.
7
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Hamano
r
e
rere should not repe
a
t
the
earlier hunks in later
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-02
Junio C Ha
m
ano
Hop
e
fully final update to
the draft Release
Not
e
s,
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
Junio C Ham
a
no
Optional Tck/
T
k: i
g
nore gen
e
rated file
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio
C Hamano
Do not bothe
r
docu
m
enting fetch--tool
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Ha
m
ano
U
pdate draft release notes
for 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
J
u
nio
C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-03-30
Jun
i
o
C
Hamano
Merge branch 'ma
s
t
er' of git://repo
.
o
r
.
c
z/git/mergetool
.
g
it
commit
|
commitdiff
|
tree
2007-03-28
J
u
nio
C
Hamano
D
o
c
umentation: unbreak user-
m
anua
l
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
J
unio C Hamano
GIT
1
.
5
.
1
-
r
c
3
commit
|
commitdiff
|
tree
2007-03-28
Junio
C
Hamano
Upda
t
e main git
.
html pag
e
to po
i
nt
at 1
.
5
.
0
.
6
d
ocumentat
i
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C
Hamano
Merge branc
h
'maint' to synchroniz
e
wit
h
1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
J
u
nio C Hamano
GIT 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
Fix
"
--
p
retty
=
forma
t
:" for parent re
l
ated items
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
git
-
commit
:
"read
-
tre
e
-m H
E
AD
"
i
s
n
o
t
the ri
g
ht way
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Junio C Hamano
sha1_
f
ile
.
c (w
r
ite_sha1
_
f
i
le):
D
etect c
l
ose f
a
ilure
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Junio C
Hamano
Document git-log -
-
first-p
a
r
ent
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Junio C Hamano
GI
T
1
.
5
.
1-rc2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Junio C Hamano
Merge bran
c
h 'jc/fpl'
commit
|
commitdiff
|
tree
2007-03-26
Junio C Hamano
Update REA
D
ME to
point at a few key per
i
odical messages
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
Junio C Hamano
M
e
rge branch '
m
aint'
commit
|
commitdiff
|
tree
2007-03-25
Ju
n
i
o C Ha
m
ano
Merg
e
branch
'
ma
i
nt' of git://l
i
nux-nfs
.
org/~b
f
ields
.
.
.
commit
|
commitdiff
|
tree
2007-03-25
Junio C Ham
a
no
Merge branch 'js/remote-sh
o
w-
p
ush'
commit
|
commitdiff
|
tree
2007-03-25
Junio C Hamano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-03-24
Junio C
H
amano
git-am do
c
umenta
t
ion: describ
e
what is taken from wher
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Junio C Hama
n
o
m
a
k
e the
p
revious
o
p
t
imization
w
or
k
also on path
-
limited
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Junio C
Hamano
r
ev-
l
ist --bis
e
ct:
Fi
x
"halfway" optimizati
o
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Junio C Hamano
Merge
b
ranch
'
master' into jc/bisect
commit
|
commitdiff
|
tree
2007-03-24
Jun
i
o C Hamano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-03-24
Junio
C
Hamano
Fix path-limited "rev-list
-
-bise
c
t" term
i
nat
i
on condition
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Junio C Hamano
git-b
i
sect
.
sh:
p
r
operly dq $GIT_DIR
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Junio C
H
a
mano
git-
b
isect: typofix
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Jun
i
o C H
a
m
a
no
check
o
ut: report
w
h
ere
the new HEAD
is upon detaching
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Junio C
Hamano
t6004: add a bi
t
m
o
re pa
t
h
o
ptimi
z
a
t
ion test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-23
Junio C Hamano
g
i
t-apply
:
Do not fre
e
the wrong buffer when w
e
co
n
vert
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio C
H
amano
M
e
rge git://git2
.
k
e
rnel
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2007-03-22
Junio C Hama
n
o
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2007-03-22
J
u
n
io
C
Hamano
git-
r
e
b
ase: ma
k
e
'rebase
H
EAD branch' w
o
rk as
e
xpected
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Jun
i
o
C
Hama
n
o
git-re
v
-list --
b
isect: optimization
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio C
H
amano
git-rev
-
l
i
st: add
-
-b
i
s
ect-vars
option
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio
C
Hamano
t
6
0
02: minor
spelling
f
ix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
J
u
nio C Ha
m
ano
tree_entry_inter
e
stin
g
(
)
:
a
llow
it to sa
y
"e
v
e
r
ything
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
Junio
C
Haman
o
tr
e
e-
d
i
ff: avoid
s
trncmp
(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-22
J
u
n
i
o
C H
a
ma
n
o
Teach tree_e
n
try_
i
n
te
r
est
i
ng() t
h
at the tr
e
e en
t
r
ies
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-21
Juni
o
C
Ha
m
ano
blame
:
cmp_sus
p
ect
i
s not "
c
m
p
" anymore
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-20
J
u
nio C
H
amano
M
er
g
e git://g
i
t
2
.
kernel
.
org/pu
b
/scm/gi
t
k/gitk
commit
|
commitdiff
|
tree
2007-03-20
Juni
o
C Hamano
b
lame: micro
-
optimiz
e
c
m
p_su
s
p
e
c
t
()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-19
Junio C
Hamano
GIT 1
.
5
.
1-
r
c1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-19
Junio C Hama
n
o
Fix me
r
g
e
-index
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-19
J
unio C Hama
n
o
Merg
e
branch
'
jb/gc'
commit
|
commitdiff
|
tree
2007-03-19
Junio
C
Haman
o
Merge
branch
'fl/cvsserver'
commit
|
commitdiff
|
tree
next