repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Fix twoway_merge that passed d/f conflict marker to merged_entry().
2007-04-04
J
unio C H
a
m
ano
Fix
t
w
o
w
a
y
_
me
r
ge that pass
e
d d/
f
conflict marker to
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
Ham
a
no
F
i
x read
-
t
ree --pr
e
fix=dir/
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hama
n
o
unpack-trees: get
r
id of *indpos paramete
r
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
unpac
k
_trees
.
c:
pass
unpack_trees_options structur
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C
H
amano
ad
d
_cac
h
e_entry(): remo
v
al
of file foo does
not c
o
nflict
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
ni
o
C
Hamano
Merge
b
ran
c
h 'jc
/
bisect'
commit
|
commitdiff
|
tree
2007-04-04
Ju
n
io C Hamano
Merge branch 'f
l
/doc
'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge branch 'post1
.
5
.
1/blame
.
el'
commit
|
commitdiff
|
tree
2007-04-04
Jun
i
o C Hamano
Me
r
ge br
a
nch 'post1
.
5
.
1
/tcltk'
commit
|
commitdiff
|
tree
2007-04-04
Junio
C
H
aman
o
Mer
g
e branch 'post1
.
5
.
1/p4'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Me
r
ge bra
n
ch 'lt/
d
irwalk'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
GIT 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C
H
amano
M
e
rge 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
a
k
u
b
N
a
rebski
Documentation: A few m
i
nor fixes to Gi
t
U
s
er's Manual
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Nicolas Pitre
Plug memory l
e
ak in index-pack collisi
o
n
c
heck
i
ng
c
o
de
p
at
h
.
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
rerere should not repeat t
h
e earlier hunks in later
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-02
Juni
o
C Hamano
Hopefull
y
final upda
t
e to
t
he
draft Relea
s
e Notes,
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
Jun
i
o
C Ham
a
n
o
Op
t
ion
a
l Tc
k
/Tk: ignore genera
t
ed fi
l
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
E
y
gene Ryabinkin
Eliminat
e
checks
o
f
us
e
r-spec
i
fied Tcl/T
k
i
nter
p
reter
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
Eygene Ryabinkin
Rewr
i
t
e
Tcl/Tk interpreter path for the
G
UI tools
.
commit
|
commitdiff
|
tree
2007-04-01
E
ygene Ryab
i
n
k
i
n
Add --with-tcl
t
k an
d
--withou
t
-tcltk to co
n
figu
r
e
.
commit
|
commitdiff
|
tree
2007-04-01
Ey
g
ene Ryabinkin
NO_TCLTK
commit
|
commitdiff
|
tree
2007-04-01
Eygene Ryabink
i
n
Added
co
r
r
ect Python path to the RPM
spec
f
ile
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
Brian Gernhar
d
t
Re
m
ove unus
e
d WITH_O
W
N
_SUBPROCES
S
_PY from RPM
spec
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
Eyge
n
e Ryabinkin
Added git-p4 package to the list of
g
it RPMs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
Eygene R
y
abin
k
in
Add the WITH_P4I
M
PORT knob to the
Mak
e
file
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
Xavier
M
aillard
git-b
l
a
m
e
.
e
l: pick a set of random col
o
rs for eac
h
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
Xav
i
e
r Maillard
git-blame
.
e
l
: se
p
arat
e
git-bla
m
e-mode t
o
e
ase
m
ainte
n
ance
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
Lin
u
s Torvalds
Optimize di
r
ec
t
ory listing
w
ith
p
athspec limiter
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-31
Frank Lichtenheld
cvss
e
rver:
D
on't lie about bin
a
ry mode
in asciidoc
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-31
Eric Wong
git-
s
v
n: fail on rebase if we are u
n
abl
e
t
o
fi
n
d
a
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-31
Alex R
i
esen
Keep rename/rename conflicts
of intermediat
e
merg
e
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-31
Julia
n
Phi
l
lips
contrib/workdir
:
a
dd a simple sc
r
ipt to crea
t
e a working
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-31
An
d
y Parkins
Reimplem
e
nt emai
l
ing p
a
rt of h
o
oks
-
-up
d
ate in
c
ontr
i
b
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-31
Eric Wong
git-svn: avoid respewing
similar error
m
ess
a
g
e
s for
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-31
Theodore
T
s'o
R
ename warn() to
w
arnin
g
() to fix symbo
l
confli
c
ts
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-31
Don Zickus
git-ma
i
linfo fixes for
patch
mu
n
g
i
ng
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-31
Ja
k
ub
Nareb
s
ki
gitweb: Su
p
port comparin
g
b
lobs (files)
w
ith different
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
J
u
nio
C H
a
mano
D
o
not bother d
o
c
u
mentin
g
fet
c
h--tool
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Ham
a
no
Up
d
ate
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
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2007-03-30
Francis Daly
git-quiltimport /b
i
n
/
sh-is
m
fix
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Christian Coude
r
Bi
s
ect: Im
p
rov
e
error
m
e
s
sage i
n
"bisect
_
n
e
xt_check"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio
C
Hamano
Merge branch 'master' of git://repo
.
or
.
cz/g
i
t/mergetool
.
git
commit
|
commitdiff
|
tree
2007-03-29
H
.
Peter Anvin
git-u
p
load-pa
c
k: make sur
e
we
close
unused
pipe ends
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-29
G
e
rrit P
a
pe
Documentation/git-rev-parse
.
txt: fix e
x
ample
i
n SPECIFYING
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-29
Gerrit Pa
p
e
Documentati
o
n/git-svnimport
.
txt: fix typo
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C
Hamano
Documentation:
unbreak u
s
er-manual
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Fra
n
k Lichtenheld
Documentation: Add v
e
rsion
i
n
formation to man pag
e
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Frank L
i
chten
h
e
l
d
Documentation: Re
p
lace @@GIT_VER
S
I
O
N@
@
i
n
documentation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C
H
amano
GIT 1
.
5
.
1-rc3
commit
|
commitdiff
|
tree
2007-03-28
Junio C H
a
mano
Up
d
at
e
main git
.
html
p
age to po
i
nt at 1
.
5
.
0
.
6 documentation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Jun
i
o C Ham
a
no
Merge
br
a
nch 'ma
i
nt' to s
y
nchronize with
1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Ju
n
io C H
a
mano
GIT 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Jeff King
commit: fix
p
retty-pr
i
nting of me
s
sages w
i
th "\nencod
i
ng "
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
J
o
h
annes Schindelin
t
4
1
18
:
be nice t
o
non-GNU
sed
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Jeff Ki
n
g
t
/t600
6
:
a
dd tests f
o
r a sligh
t
ly more complex commit
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Jeff King
Fix "--
p
ret
t
y=format:
"
enc
o
ding i
t
e
m
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Juni
o
C Hamano
Fix "--pretty=forma
t
:"
f
or parent r
e
lated it
e
ms
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Ger
r
it
P
ape
http-
f
etch: r
e
move path_len f
r
om s
t
ruct
alt_base,
i
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Gerri
t
Pape
http-fetch: don't use doub
l
e-slash as directory sepa
r
ator
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C
H
a
m
ano
git-commit: "read-tree -m HEAD" is not
t
h
e right way
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Jeff
King
Add s
o
m
e
basic tests of re
v
-
l
i
st --pr
e
tty=format
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
H
.
Pet
e
r Anvin
git-
u
p
l
oad-p
a
ck: m
a
ke
s
ure we close unused pipe ends
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Jeff King
--
p
retty=f
o
r
mat: fix broken %ct and %at interp
o
lation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
J
am
e
s
B
o
wes
use xrealloc i
n
help
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Ja
m
e
s Bowes
read-tre
e
:
us
e
xcal
l
oc
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
L
i
nus Torv
a
lds
Fix "getaddrinf
o
()
"
buglet
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Gerrit Pape
Makefi
l
e: remov
e
test-chmti
m
e pro
g
ram
in ta
r
get clean
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Jaku
b
Narebski
gitweb: C
l
eanu
p
a
nd uniquify d
i
e_error cal
l
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Ju
n
io C H
a
mano
s
h
a1_file
.
c (write_sha1_file): Detect clo
s
e failur
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Alexand
r
e Jullia
r
d
g
it
.
el:
D
isplay some information about the HEAD
c
ommit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Ju
n
io C Hama
n
o
Doc
u
m
ent
git
-
log --f
i
rs
t
-p
a
rent
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Christian
Couder
Bisect: add checks at th
e
b
eginning of
"
git bisect
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
J
i
m Me
y
ering
sha1_file
.
c
(
write_sha1_from_fd): Detect close fai
l
ure
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
J
e
ff King
git-rm: don't remove newly
a
dde
d
file wi
t
h
o
ut -f
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Christ
i
an Couder
Bi
s
e
c
t: U
s
e
"git-show-
r
ef --ve
r
i
f
y
"
when reseting
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Jakub Na
r
e
b
s
k
i
git
w
eb: Add
e
x
ample of config file and
h
ow to
g
enera
t
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Junio C
H
ama
n
o
GIT 1
.
5
.
1-rc2
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Eric Wong
git-svn: fix
r
el_path() whe
n
n
ot c
o
nnected to the
repository
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
James Bowes
u
se xmalloc in
git
.
c and
help
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Junio
C Hamano
Merge branch 'jc/fpl'
commit
|
commitdiff
|
tree
2007-03-26
Junio
C
Hamano
Update README to point at a
f
ew key periodi
c
al m
e
ssages
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
J
unio
C
Hamano
M
erge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-03-25
Ju
n
io C H
a
mano
Merge branch 'maint' of git://lin
u
x-nfs
.
or
g
/~bfields
.
.
.
commit
|
commitdiff
|
tree
2007-03-25
Junio C Hamano
M
e
rge branch 'js
/
remo
t
e
-show-pu
s
h
'
commit
|
commitdiff
|
tree
2007-03-25
Junio C Hamano
Merge
b
ra
n
ch
'maint'
commit
|
commitdiff
|
tree
2007-03-25
A
l
ex Riesen
Use diff* with
--e
x
it-code
i
n g
i
t-am, g
i
t
-reb
a
se
a
nd
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
Alex Riesen
Document --qui
e
t optio
n
to
g
it-diff
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
Ni
c
olas Pitre
writ
e
_sha1_from_
f
d() should
make new objects read
-
only
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
Nicolas Pit
r
e
make i
t
m
ore obvious that
tempo
r
ary files are temporary
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
A
n
d
y Parkins
upda
t
e-hook: remo
v
e e-mail sending
hook
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
Jakub Narebski
gitweb: A
d
d some inst
a
l
la
t
i
o
n
notes
i
n gitweb/INSTA
L
L
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
Jaku
b
N
are
b
ski
gitweb
:
Fix not marking
s
i
g
no
f
f lines in "log" view
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
Jakub
Narebs
k
i
gitweb: Don't escape attributes in CGI
.
pm HTML me
t
hod
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
Li Yang
gitweb: Change
t
o use explicitly fu
n
ction call cgi
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Junio C Ha
m
ano
g
i
t-am document
a
tion: describe
w
h
at i
s
taken f
r
om
w
h
ere
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Jo
h
annes
S
chinde
l
in
g
i
t-re
v
ert: Revert
re
v
ert message to old beha
v
io
u
r
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Junio C Hamano
mak
e
t
h
e
pre
v
ious optimiz
a
tion work
a
lso on path-limited
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next