repo.or.cz
/
git
/
gitweb.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge-recursive: add/add really is modify/modify with an empty base
2006-12-13
Johannes Schin
d
elin
merge-recursive: add/add really is modi
f
y/modify with
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge br
a
nch 'ma
s
t
er' into js/merge
commit
|
commitdiff
|
tree
2006-12-13
Jo
h
an
n
e
s
Schindelin
Get ri
d
of
the depende
n
c
y
on RCS'
m
er
g
e pr
o
gram
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
E
r
ic Wo
n
g
g
i
t-svn:
cor
r
ec
t
ly handle packed-
r
e
f
s i
n
re
f
s/remotes/
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Ham
a
no
add test case for r
e
cursive merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
E
r
ic W
o
n
g
git-
s
vn: c
o
rrectly display fata
l
() error mess
a
ges
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Er
i
c Wong
git-svn: allow dcommit to take an alternate head
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Eric Wong
gi
t
-svn: enable
l
o
ggin
g
of information not suppo
r
ted
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Al
e
x Riesen
Clarify
fetch error for missing obj
e
ct
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-12
Bri
a
n
G
ernhardt
Mo
v
e Fink and
P
orts ch
e
ck to after config fil
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio C Hama
n
o
sh
o
rtlog: fix segfault on empty
a
u
thorn
a
me
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio C Ha
m
ano
sh
o
r
t
log: remove "[PATCH
]
" prefix from sho
r
tlog out
p
ut
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
J
uni
o
C
H
amano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2006-12-11
Sha
w
n
O
.
Pearc
e
Make s
u
re the
e
mpty tree
exists
w
hen
n
ee
d
ed in mer
g
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
J
im Mey
e
ring
D
o
n
'
t
use mem
c
py whe
n
source and dest
.
buff
e
rs ma
y
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Chris Wright
n
o
ne
e
d to install ma
n
pages as e
x
ecutab
l
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-09
J
.
Bruce F
i
e
lds
Doc
u
mentation: simpler share
d
reposito
r
y creation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-09
J
e
f
f
K
ing
s
hortlo
g
: fix segfault on empty authorname
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-09
Josef Weiden
d
orf
e
r
Add branch
.
*
.
m
er
g
e warning an
d
documentation update
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-08
Junio
C
Hamano
Fix per
l
/ build
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-08
Eric Wong
gi
t
-svn: use do_switch
f
or --follo
w
-pa
r
ent
i
f
t
h
e
SVN
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-08
Uwe Z
e
isber
g
er
F
ix doc
u
ment
a
tion co
p
y&paste ty
p
o
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-08
Eric Wo
n
g
git-svn:
extra error check to
ensure we ope
n
a file
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-08
J
.
Bruce
F
iel
d
s
Do
c
umentatio
n
:
u
pdate git-clone man
page with new
behavior
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-07
Junio C Hamano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2006-12-07
Mar
t
in
Lang
h
o
f
f
cvsserver: Avoid
misc
o
u
n
ting b
y
tes
in Pe
r
l v5
.
8
.
x
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-07
N
i
c
o
l
as Pi
t
r
e
c
h
ange the unpack
l
imi
t
tr
e
sho
l
d to a san
e
r
value
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-07
J
.
Bruce
F
ields
Document
a
tion: re
o
rga
n
ize cvs
-
migrat
i
on
.
txt
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Juni
o
C H
a
m
a
no
git-merge: fix "fix confusion betw
e
en tag
a
nd bran
c
h
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Eric
W
ong
git-svn: avoid n
e
t
w
ork timeouts for
l
ong-ru
n
ning fetches
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Jakub Narebski
g
i
tweb
:
Allow
PNG,
GIF, JP
E
G im
a
ges to be
d
isplayed
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
J
unio
C
Hamano
git-me
r
ge: squelc
h
ne
e
d
less e
r
ror
m
e
ssag
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Junio C
H
amano
Merge
commit
|
commitdiff
|
tree
2006-12-06
Junio C H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2006-12-06
Junio
C Hamano
git-re
s
et to remove "$GIT_DIR/MERGE_MSG"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
J
ohanne
s
S
c
hind
e
lin
mer
g
e-file: suppo
r
t -p and
-
q; fix compile war
n
ings
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Joh
a
nnes Schind
e
lin
A
d
d
bu
i
ltin merge-fi
l
e, a minimal replacement f
o
r RCS
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
J
.
Bru
c
e Fields
cvs-migration: imp
r
oved section titles,
b
etter p
u
sh
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
J
o
ha
n
n
es S
c
hindelin
c
v
s
-migration do
c
ument: make the need for
"
p
ush" more
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-05
J
o
hann
e
s S
c
h
i
n
delin
xdl_me
r
ge(): fi
x
and simplify conflict handling
commit
|
commitdiff
|
tree
2006-12-05
Jakub Nar
e
bski
Document g
i
t
-diff whit
e
space flag
s
-b and -w
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-05
Jo
h
annes Schindelin
d
i
ff -b
:
ign
o
re whi
t
espa
c
e at
e
n
d o
f
line
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-05
J
u
nio C Hamano
Merge b
r
anc
h
'mai
n
t'
commit
|
commitdiff
|
tree
2006-12-04
Junio C Ha
m
a
n
o
unpa
c
k-trees
:
make sure "df_
c
o
nf
l
ict_entry
.
na
m
e" is
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
Junio C Hamano
rec
e
i
ve-pac
k
:
do not
i
nsist on fas
t
-forward outside
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
Michael Loeffler
git-fetch: ignore dereferenced tag
s
in
expand_refs_wildcar
d
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
Jakub Nar
e
b
s
ki
git-
c
lone
:
Rename --use-immingled-remote option to
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
Jakub
N
arebski
gitweb: Fix Ato
m
fee
d
<logo>: it is $logo, not $l
o
go_url
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
Alex
R
i
esen
M
a
ke perl/ build procedure ActiveState
f
ri
e
nd
l
y
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
D
a
vid Mil
l
er
Pass -M to d
i
ff in req
u
est
-
pull
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
Jim
M
eyering
Set permissions of each new f
i
l
e before "cvs add"ing
it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
Joha
n
nes Schindelin
git
-
m
v
: s
e
arch more
pr
e
c
isely for source directory
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Joh
a
nnes Schinde
l
in
xdl_mer
g
e():
fix thinko
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Johannes Sc
h
in
d
elin
xdl_m
e
rg
e
(
): fix an off-by-one bug
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
J
u
nio C Haman
o
merge-recurs
i
ve: us
e
xdl_merg
e
()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
J
unio
C Hama
n
o
x
m
e
rge
:
make return
v
alue from xdl_merge
(
) more usable
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Jo
h
annes
Schindeli
n
xdi
f
f: add xdl_m
e
rge()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Junio C Hamano
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2006-12-03
E
r
ic Wo
n
g
g
it
-
sv
n
:
a
void fetching files twice
i
n the same revision
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Junio C Ham
a
no
git-merge: fix
c
onfusion between tag and
b
ran
c
h
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-02
A
ndy Parkins
De-emphas
i
se the sym
b
olic link documentat
i
on
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-02
Andr
e
as
Eri
c
sson
git-diff: Intr
o
duc
e
--index and d
e
precate --cached
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-02
Andreas E
r
icsson
ls-fil
e
s: Give hints whe
n
errors hap
p
en
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-30
Nicolas P
i
tre
pack-objects: remove redundent status i
n
f
o
rmation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Juni
o
C
Hamano
Merge m
a
st
e
r
.
kernel
.
org:/pub
/
scm/g
i
tk/gitk
commit
|
commitdiff
|
tree
2006-11-29
Ju
n
io
C
Hama
n
o
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2006-11-29
A
n
dy Parkin
s
Document git-re
p
o
-config -
-
b
ool/--
i
nt
o
ption
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
J
u
n
i
o
C Hamano
tutorial: talk about user
.
name early
a
nd
d
on't start
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
A
l
ex Riesen
g
i
t-
b
lame: fix
r
ev parameter handling
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Junio C H
a
man
o
Merge branch 'j
c
/glob
f
e
tc
h
'
commit
|
commitdiff
|
tree
2006-11-29
Junio
C
Hamano
Merg
e
br
a
nch
'
maint'
commit
|
commitdiff
|
tree
2006-11-29
Ju
n
io
C
Hama
n
o
git
b
l
a
m
e -C: fix outpu
t
fo
r
mat twea
k
s when crossing
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Eric Wong
git-svn: f
i
x
m
ulti-init
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
E
r
ic Wong
git-svn: docume
n
tation
updat
e
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Eric Wong
git-svn: color support for
t
he log comma
n
d
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Han-Wen Nienhu
y
s
ident
.
c: T
r
im
h
i
nt pr
i
nted
w
hen gecos i
s
empty
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
Shawn
O
.
Pe
a
rce
Fix broken ba
s
h completion of lo
c
al
refs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
Shawn O
.
P
e
arc
e
Teach
bash how
t
o
c
omplet
e
long o
p
tions
for git-commit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
Eric Wo
n
g
g
i
t-sv
n
:
f
ix outpu
t
repo
r
ting from th
e
delta fet
c
her
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
Eric Wong
git-svn
:
er
r
o
r
out when the SVN c
o
n
nection fails during
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
R
e
n
é
S
charfe
s
h
ortlog: remove range check
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
E
ric Wong
git-svn: updat
e
tests
for rec
e
nt change
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
Eric Wong
g
it-sv
n
: enable delta transfers during fetches
w
hen
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
A
ndy Parkins
Use
.
git/confi
g
for
s
toring "origi
n
"
shortcut repo
s
itory
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
Johannes Schindelin
s
ha1_object_info(): be consiste
n
t with re
a
d_sha1_file()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
J
o
hannes Schind
e
li
n
shortlog
:
use p
a
ger
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Jun
i
o
C
Hamano
c
vsi
m
po
r
t: style
f
ix
u
p
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Eric Wong
git-svn: use ~/
.
subversion config files
w
hen using
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Sh
a
wn O
.
Pearce
Teach
b
a
s
h about g
i
t
-am/git-apply
a
nd their w
h
itespace
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
Cach
e
t
he list of
m
erge
s
trategies and
available commands
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
S
upport --
s
tra
t
egy=x completion in ad
d
ition to -
-
strat
e
gy x
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
P
e
arce
Tea
c
h
bash about git-
r
epo-c
o
nfig
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Sha
w
n
O
.
Pea
r
ce
Supp
o
rt bash
completion of refs/re
m
ote
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Sh
a
wn O
.
Pearce
Teach ba
s
h about git log/show/whatc
h
anged opti
o
ns
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
T
e
ach bash how to co
m
plete git-rebase
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
P
e
arce
T
each b
a
sh h
o
w to
c
omplete git-cherry-pick
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pea
r
ce
Teach bash how t
o
complete git-format
-
p
atch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
Add current branc
h
i
n
PS1 support to git-c
o
m
pletion
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pea
r
ce
Teach bash how to compl
e
te options for git
-
name
-
rev
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next