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
Junio C Hama
n
o
Fix twowa
y
_me
r
ge that passed d/f conflict marker to
.
.
.
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Fi
x
read-tree --prefi
x
=dir
/
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
unpack-trees: get r
i
d o
f
*indpos parameter
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Hamano
unpac
k
_trees
.
c: p
a
ss unpack_trees_options structure
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
J
u
n
io C Hamano
add_cache_ent
r
y(): re
m
oval
o
f file fo
o
does not conflict
.
.
.
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
Ju
n
io C Ha
m
ano
Mer
g
e
b
ranch 'fl
/
d
o
c'
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio C Hamano
Mer
g
e bran
c
h 'post1
.
5
.
1
/blame
.
el'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge branch 'post1
.
5
.
1/tc
l
tk'
commit
|
commitdiff
|
tree
2007-04-04
Junio C Hamano
Merge branch
'
post1
.
5
.
1/p
4
'
commit
|
commitdiff
|
tree
2007-04-04
Juni
o
C Hamano
Merge branch 'lt/dirwal
k
'
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
Mer
g
e
1
.
5
.
0
.
7
i
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Junio C Ha
m
ano
GIT
1
.
5
.
0
.
7
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Jakub Narebski
Documentation: A few minor
fix
e
s to Git
User's Manual
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-04
Nicolas Pitre
Plu
g
memo
r
y lea
k
i
n index-pack collision checking c
o
dep
a
th
.
commit
|
commitdiff
|
tree
2007-04-04
J
u
nio
C
Hama
n
o
r
e
rere shou
l
d n
o
t
repeat
the
earlier hunks in later
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-02
Ju
n
i
o C Ham
a
no
H
opefull
y
final update
t
o
t
he dra
f
t Release Notes,
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
Junio C H
a
mano
Optional Tck/Tk: ign
o
re
gene
r
ated f
i
les
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
Eygene Ryabinkin
Elimi
n
ate che
c
ks of user-spe
c
i
f
ied Tcl/Tk
i
nterpr
e
ter
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
E
ygene Ryabinkin
Rewri
t
e
T
cl/T
k
interpret
e
r path for t
h
e GUI tools
.
commit
|
commitdiff
|
tree
2007-04-01
Eyge
n
e Ryab
i
nki
n
A
d
d
--with-tcltk an
d
--wi
t
hout
-
tcltk to configure
.
commit
|
commitdiff
|
tree
2007-04-01
Eygene
R
yabink
i
n
N
O_TCLTK
commit
|
commitdiff
|
tree
2007-04-01
Eygene
Ryabinkin
A
d
de
d
c
o
rrect Python path to the RPM specfile
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
B
rian Gernhardt
Remove unused W
I
TH_OWN_SU
B
PROCESS_PY from
R
P
M spec
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
E
ygene Ryabi
n
kin
Added g
i
t
-p4 package to the list of git
RPMs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
Eygen
e
Ryabinki
n
Add the W
I
T
H_P4IMP
O
RT knob to the Makefi
l
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
Xavier M
a
illar
d
git
-
blame
.
el: pic
k
a set
of rand
o
m co
l
ors for ea
c
h
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
Xavi
e
r Maillard
git-blam
e
.
el
:
s
e
parate gi
t
-
b
lame-mode to ease maintenance
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-04-01
L
i
nus Tor
v
alds
Optimize directo
r
y lis
t
ing
w
ith path
s
pec limiter
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-31
Frank Lichtenhel
d
cvsserver: Don't lie about
bina
r
y m
o
d
e in
asciido
c
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-31
Eric W
o
ng
git-svn: fail on rebase if w
e
are unable to fi
n
d
a
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-31
A
lex
Riesen
K
eep rename/rename conflicts of interme
d
iat
e
merge
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-31
Ju
l
ian P
h
illips
con
t
r
i
b/workd
i
r: add a
s
imple
s
c
r
ip
t
to create a
w
orkin
g
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-31
A
ndy Parkins
Reimplement e
m
a
i
l
ing part of h
o
oks--update in cont
r
ib
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-31
Eric
W
o
n
g
git-svn: avoid respewing similar err
o
r messages for
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-31
Theodor
e
Ts'
o
Rename warn() to warn
i
n
g
() to
fix sy
m
bol con
f
licts
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-31
Don Zick
u
s
g
it-mailinfo f
i
xes fo
r
patch
mu
n
g
ing
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-31
Jakub Narebski
gitweb: Support comparing blobs (files) with differe
n
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Ju
n
io C
H
amano
Do not bo
t
her doc
u
men
t
i
ng fe
t
ch--tool
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio C Ham
a
no
Upda
t
e draft
r
elease notes
for 1
.
5
.
1
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Jun
i
o C Hamano
Merge b
r
an
c
h 'maint'
commit
|
commitdiff
|
tree
2007-03-30
Francis
D
aly
g
it-quiltim
p
or
t
/bi
n
/sh-i
s
m
fix
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Christian
C
oud
e
r
Bi
s
ect: Improve error
mess
a
ge in "bisect_next_check"
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-30
Junio
C
H
a
m
a
n
o
M
e
r
ge branch 'master'
of git://repo
.
or
.
cz/
g
it
/
me
r
g
e
tool
.
git
commit
|
commitdiff
|
tree
2007-03-29
H
.
Peter A
n
v
in
g
it-up
l
oa
d
-pack: make
sure we close u
n
used p
i
p
e e
n
ds
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-29
G
e
r
rit Pap
e
Documentati
o
n/gi
t
-r
e
v
-pa
r
se
.
t
xt:
fix example i
n
S
P
ECIFYING
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-29
Gerrit Pape
Doc
u
mentation/gi
t
-svnimport
.
t
xt
:
fix typ
o
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
Doc
u
m
e
nta
t
ion:
un
b
reak user-manual
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Frank Lichtenheld
Documentation: A
d
d v
e
rsion
inf
o
r
mation to man pages
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Frank Licht
e
nheld
Documentation:
R
eplace
@
@GIT_VERSION@@
in do
c
umentation
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
Updat
e
main
g
it
.
html p
a
ge to po
i
nt at 1
.
5
.
0
.
6 docum
e
ntat
i
on
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C
H
a
m
ano
Me
r
ge branc
h
'maint' to sy
n
ch
r
oniz
e
with 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
G
IT 1
.
5
.
0
.
6
commit
|
commitdiff
|
tree
2007-03-28
Jeff Kin
g
c
o
mmit: fix pretty-prin
t
ing of
messages with "
\
n
e
ncoding "
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Johanne
s
Schindelin
t4118:
be
n
ice to non-GNU
s
ed
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Jeff
King
t
/t60
0
6: add tests f
o
r a slightly
m
ore comp
l
ex commit
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Jeff King
F
i
x "-
-
pretty=format:" encoding item
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
J
unio C
Hamano
Fix "--pretty
=
format:" for parent rela
t
ed item
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Gerr
i
t Pape
htt
p
-fetch: remove path_len from struct alt
_
base, it
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Gerrit Pape
htt
p
-fetch: don't use double-s
l
ash
as direct
o
ry
s
epa
r
ator
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Junio C Hamano
git-commit: "re
a
d-tree -m HEAD
"
is
n
o
t
the ri
g
ht wa
y
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
J
e
ff
K
ing
A
d
d
some basic tes
t
s of rev-list --pretty
=
format
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
H
.
P
e
ter Anvi
n
gi
t
-upload-pack: make sure
w
e cl
o
se unused pipe ends
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-28
Jeff Ki
n
g
--pretty=format: fix bro
k
en
%
ct and %
a
t interpolation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
J
ames Bow
e
s
us
e
x
r
e
a
llo
c
in help
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Jam
e
s Bowes
read-tree
:
use xcalloc
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Linus Torvalds
Fix "ge
t
ad
d
rinfo()" bugl
e
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Gerrit Pape
Make
f
ile: remo
v
e test-chmtime progra
m
in target clean
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Jakub Nareb
s
ki
gitweb: Cleanup and uniquify die_er
r
or
c
alls
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Junio C H
a
man
o
sha
1
_file
.
c (write_sha1_file): Detect close
f
ailure
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Alexandre J
u
lliard
g
it
.
el:
Displ
a
y s
o
me informatio
n
about the HEAD commi
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
J
u
nio C Hamano
Document
g
it-log --first-parent
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Christian
Coud
e
r
Bisect: add c
h
ecks a
t
the b
e
g
inning of "git bisect
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Jim Meyering
sha1_
f
ile
.
c (write_sha1_from_
f
d
)
: Detect c
l
ose
fa
i
lure
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-27
Jeff King
git-rm: don't
r
emove newly
a
dded file
w
ithout -f
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Ch
r
isti
a
n Couder
Bi
s
ect: Use "g
i
t
-
s
how-re
f
--verify" when
r
e
s
etin
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Jakub
N
arebski
gitwe
b
: Add
e
x
a
m
p
le o
f
c
o
nfig
file and
how to
g
e
n
er
a
te
.
.
.
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
g
it-svn
:
fi
x
rel_path() when not
conn
e
ct
e
d to the
repos
i
tory
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
James Bowes
use xmal
l
oc in git
.
c and help
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-26
Juni
o
C Hamano
Merge branch 'jc
/
fpl'
commit
|
commitdiff
|
tree
2007-03-26
Junio C Ha
m
ano
Up
d
at
e
R
EADME to
p
oint at a few key periodical
messages
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
Junio C Haman
o
Mer
g
e b
r
a
n
ch
'mai
n
t'
commit
|
commitdiff
|
tree
2007-03-25
Junio C Ha
m
ano
Merge branch 'maint
'
o
f git://linux-nfs
.
org/~bf
i
elds
.
.
.
commit
|
commitdiff
|
tree
2007-03-25
Junio C Hamano
Merge branch
'js/remote-show-push'
commit
|
commitdiff
|
tree
2007-03-25
Juni
o
C
H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-03-25
Al
e
x Riesen
Use di
f
f* with --
e
xi
t
-code in git-am,
g
i
t-rebase and
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
Alex Riesen
Document
--quiet opt
i
on to
g
it-diff
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
Nicol
a
s Pitre
wri
t
e
_sha1_from_fd
(
) should mak
e
new obj
e
cts read-only
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
N
i
c
o
las
P
itre
m
ake
it m
o
re obvious that te
m
porar
y
files
are t
e
mporary
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
Andy Par
k
i
ns
upda
t
e-hook:
remove e-
m
ail sending h
o
ok
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
Ja
k
ub Narebsk
i
gitweb:
A
dd
s
ome
installation notes in gitweb/INSTALL
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
Jak
u
b Narebski
gitweb: Fix n
o
t
m
arki
n
g signoff l
i
nes 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 a
t
tr
i
but
e
s in CG
I
.
pm HTML methods
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-25
Li Yang
gi
t
we
b
: Change to use explicitly fu
n
ction call cgi
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Junio
C Ham
a
no
git-am documenta
t
io
n
: describe w
h
at is t
a
ken from wh
e
re
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Joh
a
nnes Schindelin
git-r
e
v
e
r
t: Rev
e
rt re
v
ert message
t
o old
b
ehaviour
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2007-03-24
Junio C Hamano
m
ake t
h
e previous
o
ptimization work
a
lso on
p
ath-li
m
ited
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next