repo.or.cz
/
git
/
platforms
/
storm.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Remove uncontested renamed files during merge.
2006-12-13
Sh
a
w
n
Pear
c
e
Remove uncont
e
sted rename
d
fi
l
es during merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Jun
i
o
C
Hamano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2006-12-13
Eric Wong
g
i
t-svn: correctly di
s
play fatal() error mes
s
ages
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Eric Wong
g
i
t-
s
vn: exi
t
with sta
t
us 1 for test fail
u
r
e
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
And
y
P
a
rk
i
n
s
A
l
low subcom
m
and
.
color and c
o
lor
.
subcommand
co
l
o
r co
n
f
i
gurati
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Ju
n
i
o
C Hamano
g
it
-
push: do
c
um
e
nt r
e
mova
l
of remote re
f
with :<
d
st
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Eric
W
ong
git-svn: correct
l
y
handle packed-refs in ref
s
/rem
o
tes/
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
add
t
est c
a
se fo
r
r
e
c
u
r
s
i
ve merg
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Er
i
c Wong
git-
s
vn
:
c
o
rrectly
di
s
p
l
ay fatal() error
m
essages
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Eric
W
o
n
g
git-svn: al
l
ow dcommit to
take an alt
e
rnate head
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Eri
c
Wong
git-svn: enable l
o
gging of info
r
mation
not support
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Alex
Riesen
Cla
r
ify
f
etch err
o
r for missing objec
t
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-12
Bria
n
Gernhardt
M
ov
e
Fink and
Ports check
t
o after config
f
i
l
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
J
u
nio C Hamano
shortlog: fix
s
egfa
u
l
t on empty auth
o
rname
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
J
unio C Hamano
shortl
o
g: remove "
[
PATCH]" p
r
e
f
ix from shortlog o
u
tput
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio C Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2006-12-11
Shawn O
.
P
earce
Make sure the empty tre
e
exists when needed in merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
J
i
m
Me
y
ering
D
on
'
t use
memcpy when sour
c
e a
n
d des
t
.
buffers may
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Ch
r
is
W
righ
t
no ne
e
d
t
o install
m
anpages as execu
t
able
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-09
J
.
Br
u
ce
F
i
elds
D
ocumentati
o
n: simpler s
h
ared re
p
o
s
i
tor
y
creation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-09
Jeff
K
ing
s
h
ortlog: fix s
e
gfault on empty authorname
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-09
Josef Weidendorf
e
r
A
d
d
bran
c
h
.
*
.
mer
g
e warning an
d
d
ocum
e
ntation update
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-08
Junio
C
Haman
o
F
i
x perl/ build
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-08
Eri
c
Wong
git-svn: use do
_
swit
c
h for --follo
w
-parent if
t
he
SVN
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-08
Uw
e
Zeisberger
Fix
d
ocume
n
t
a
tion co
p
y
&
p
aste
t
ypo
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-08
Eric Wong
g
i
t
-svn: ex
t
ra error check to ensure we op
e
n a file
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-08
J
.
B
r
uce Fields
Documentat
i
on: update g
i
t-cl
o
ne man page with new
b
e
h
a
vior
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-07
J
u
nio C
H
a
mano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2006-12-07
Martin
Langhoff
cvsserver: Avoid miscou
n
ting byte
s
in Pe
r
l v5
.
8
.
x
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-07
Nicolas Pitre
c
ha
n
ge
the unpack limit tresho
l
d to a saner value
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-07
J
.
Bruce
Fiel
d
s
Documentation:
r
e
o
r
ga
n
i
z
e cv
s
-migration
.
txt
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Juni
o
C Ha
m
a
no
gi
t
-merge: fix "fix co
n
f
usion between tag and
branch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
E
r
ic Wong
git-svn: avo
i
d
net
w
ork timeou
t
s
fo
r
l
ong-running
fetches
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Jakub Narebski
gitweb: A
l
low PNG, GIF, JPEG image
s
to be displayed
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Junio C Ham
a
no
git-
m
erg
e
:
squelch needless e
r
ror
m
essage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Junio C Hamano
Mer
g
e
commit
|
commitdiff
|
tree
2006-12-06
Jun
i
o C Hamano
M
e
rge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2006-12-06
Junio C
H
a
man
o
git-reset to remove
"
$GIT_DIR/M
E
RGE_MSG"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
J
.
B
r
uc
e
Fields
c
vs
-
migrati
o
n: improve
d
sec
t
ion
t
itles, bett
e
r push
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
J
ohann
e
s
S
chi
n
delin
cvs
-
m
i
gratio
n
do
c
u
ment: make the
need for "push
"
more
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-05
Jakub Nare
b
sk
i
Documen
t
git-
d
iff white
s
pace flags -b and -w
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-05
Johan
n
es Schindel
i
n
d
i
ff
-
b:
ignore
w
hite
s
pace a
t
end
of l
i
n
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-05
Junio C Ham
a
no
Merg
e
bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2006-12-04
Jun
i
o C H
a
mano
u
n
p
ack-
t
re
e
s: make
s
u
re
"df
_
con
f
li
c
t
_
entry
.
nam
e
" is
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
Junio C
Ha
m
a
no
receive-p
a
ck:
d
o
n
o
t
insist on fas
t
-
forward outside
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
Mi
c
hael Loeffler
git-fetc
h
: ignore
derefere
n
ced tags in e
x
pand_refs_wi
l
d
card
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
J
akub Na
r
ebski
git-clone: Rena
m
e --use-immingl
e
d-remote
o
ption to
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
Ja
k
ub Narebski
gi
t
w
e
b: Fix A
t
om feed <l
o
go>: it is
$logo
,
no
t
$logo_url
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
Alex
Riesen
Ma
k
e per
l
/ build pr
o
cedure
A
ctiveState friendly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
David Mille
r
Pass
-
M
t
o dif
f
in re
q
uest
-
p
u
ll
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
Jim Meyeri
n
g
Set permissions
of each new
file b
e
fore "cvs add"
i
ng it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
Joha
n
n
e
s Schi
n
delin
git-mv: search
more pre
c
isely for
s
ou
r
c
e
directo
r
y
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
J
u
ni
o
C Ham
a
no
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2006-12-03
Eric Wo
n
g
git-svn: avoid
f
etching files
t
wice
in the
s
a
me revision
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Ju
n
io C Hama
n
o
git-mer
g
e: fix confusi
o
n between tag
a
n
d branch
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-02
Andy P
a
r
ki
n
s
De-empha
s
ise the symb
o
lic
link documen
t
at
i
on
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-02
Andreas Ericsson
g
i
t-di
f
f: Intr
o
du
c
e --ind
e
x and deprecate --cached
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-02
Andreas E
r
icsso
n
ls-files: Give hints when errors happen
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-30
N
i
colas
P
itre
pack-
o
bjects: remove redundent sta
t
u
s
in
f
ormat
i
on
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Junio
C
Hamano
M
e
rge maste
r
.
k
e
rnel
.
org:/
p
ub/
s
cm/gitk/
g
itk
commit
|
commitdiff
|
tree
2006-11-29
Junio C
H
amano
Me
r
g
e branc
h
'm
a
int'
commit
|
commitdiff
|
tree
2006-11-29
And
y
Parkin
s
Document git-repo-config --b
o
ol/--int
o
ptions
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Junio
C Hamano
tutor
i
al:
talk
a
b
o
ut user
.
name
early and don't start
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Alex Riesen
git-blame:
f
ix re
v
parameter handl
i
ng
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
J
unio C
Hamano
M
erge
b
ranch
'jc/globfetc
h
'
commit
|
commitdiff
|
tree
2006-11-29
Junio C Hamano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2006-11-29
J
u
ni
o
C Hama
n
o
git b
l
ame -C: fix output format tweaks wh
e
n
c
rossing
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
E
ric Won
g
git-svn
:
fix mult
i
-
i
nit
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
E
r
i
c Wong
git-
s
vn
:
d
o
cumentation updates
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Eric Wong
git-svn: color support for the log command
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Han-Wen Nie
n
huys
ident
.
c
:
Trim hint printed when
gecos is empty
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
Shawn O
.
Pearce
Fix br
o
ke
n
ba
s
h completion of
l
ocal
r
ef
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
Shawn
O
.
Pea
r
ce
Tea
c
h ba
s
h how
t
o
c
o
mplete long optio
n
s for
g
it-c
o
mmit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
E
r
i
c
Wong
gi
t
-svn
:
fix
out
p
u
t reporting fr
o
m the delta fetcher
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
Eric Wong
git-svn: error
o
u
t when
t
h
e SVN
connection fails during
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
Ren
é
Schar
f
e
shortlog: remove range check
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
Er
i
c Wong
git-svn: u
p
date
tests for r
e
cen
t
changes
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
E
ric
W
ong
git-svn: e
n
able delta t
r
ansfers dur
i
n
g
f
e
tche
s
when
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
Andy Parki
n
s
Use
.
git/c
o
nfig for sto
r
ing "origin
"
shortcut reposi
t
ory
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
Johannes Schinde
l
in
sha1_o
b
ject_info():
b
e consist
e
n
t
wi
t
h read_sha1
_
file()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
Joha
n
nes S
c
h
indelin
sh
o
rtlog: use pager
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
J
unio C Hama
n
o
cvsimport: style fi
x
up
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Eric Wong
git-svn: u
s
e ~/
.
subversion c
o
nfig files whe
n
us
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearc
e
Tea
c
h bash about git-am/gi
t
-app
l
y an
d
their whitespace
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
S
h
a
wn O
.
Pearce
Cache the list of merge strategies
a
nd avail
a
ble commands
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Sh
a
wn
O
.
P
e
arc
e
Support --strategy=x completion in addition to --strategy x
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
Teach ba
s
h
ab
o
ut git-repo-co
n
fig
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Sh
a
wn O
.
Pearce
Su
p
po
r
t b
a
sh completion of r
e
fs/
r
emote
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shaw
n
O
.
Pearc
e
Teach bash
about git log/show/whatc
h
anged options
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shaw
n
O
.
Pear
c
e
T
e
ach bash how
to complete git-r
e
bas
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
P
e
arce
Teach bash how to complete git-cherry-pic
k
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Sha
w
n
O
.
Pearce
Teach
bash how
t
o complete gi
t
-format-patch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shawn
O
.
Pearce
Add current branch
in P
S
1 supp
o
rt to git-comp
l
e
t
ion
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pea
r
ce
Teach bash how to
complete opti
o
n
s
fo
r
git-
n
ame-rev
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
H
i
d
e
pl
u
mbing/trans
p
ort com
m
an
d
s from bash c
o
m
p
letion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
T
e
ach git-
c
ompletion
.
bash how to
c
omplete git-merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Sean
Up
d
ate
d
o
cumentation to remo
v
e
incorrect
G
IT_DIFF_OP
T
S
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Junio C Hamano
Me
r
g
e
b
r
a
nch 'js/shortlog'
commit
|
commitdiff
|
tree
2006-11-27
J
un
i
o
C
H
amano
Merge branch '
j
c/push
-
de
l
e
t
e-ref'
commit
|
commitdiff
|
tree
next