repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git merge: reword failure message.
2006-12-13
Junio C H
a
mano
git merge: reword fa
i
lure message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Sh
a
wn Pearce
Rem
o
ve u
n
contested renamed file
s
duri
n
g merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
Merge bran
c
h '
m
a
i
nt'
commit
|
commitdiff
|
tree
2006-12-13
Eri
c
Wong
gi
t
-svn: co
r
rectly display fata
l
()
e
rro
r
messa
g
es
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
E
r
ic Wong
git-svn: exi
t
wit
h
s
tatus 1 for t
e
st failures
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Andy Parkin
s
Allow subcom
m
and
.
c
o
lor and c
o
lor
.
s
u
b
command color co
n
figuration
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio
C Hama
n
o
g
i
t-push: document removal
of remot
e
ref wi
t
h
:<dst
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Er
i
c
W
ong
git-svn: correctly handle p
a
cked-refs in r
e
fs/rem
o
t
e
s/
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
J
unio C Hamano
Merge bran
c
h
'
maint
'
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hama
n
o
add te
s
t case
f
or recursive mer
g
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
E
ric Wong
git-
s
vn: correctl
y
display
fatal() error messages
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Eric Wong
gi
t
-svn: allow dcomm
i
t
to
t
ake a
n
alternate
head
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Eric Wong
g
i
t-svn: enable l
o
gging of information
n
ot
supported
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Alex Riesen
Clarif
y
fetc
h
e
rror for missing obj
e
c
ts
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-12
Brian Gernh
a
rd
t
Move Fink
a
n
d P
o
rts ch
e
ck to afte
r
c
o
nfig file
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Ju
n
io C Ha
m
ano
s
h
or
t
log: fix segfault on emp
t
y authorname
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio C
Hamano
shortlog
:
remove "[PATCH]" pr
e
fix from shor
t
log output
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Jun
i
o C Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2006-12-11
Shawn O
.
Pearc
e
Make
s
u
r
e the em
p
ty tree exi
s
ts when n
e
eded in m
e
rge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Jim
M
eyering
Don't use memcpy when source a
n
d
d
est
.
buffers may
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Chris Wr
i
ght
no need to insta
l
l
m
anpa
g
es as ex
e
cutable
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-09
J
.
Bruc
e
Fields
Doc
u
mentation: si
m
pler shared
reposito
r
y
creation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-09
Jef
f
K
ing
shortlo
g
: fix segfault on empty a
u
thorn
a
me
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-09
Josef Weidendor
f
er
A
d
d
b
ranch
.
*
.
merge
w
a
rning and document
a
tion up
d
a
t
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-08
J
u
nio C Hama
n
o
Fix perl/ build
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-08
Er
i
c
Wong
git-s
v
n: use do_switch
f
or --follow-parent if the SVN
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-08
U
w
e Zei
s
berger
Fix documentatio
n
copy&paste typo
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-08
Eric Wong
git-svn:
ex
t
ra er
r
or check
to ens
u
re we open a
f
il
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-08
J
.
Bruce Fiel
d
s
Documentation
:
u
p
d
a
te
g
it
-
clone man
p
age with
n
e
w beha
v
ior
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-07
J
unio
C
Hama
n
o
M
erge
branch 'maint'
commit
|
commitdiff
|
tree
2006-12-07
Martin
L
a
nghoff
cvsserver: Avoid miscounti
n
g byte
s
in Perl v5
.
8
.
x
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-07
Nicolas Pit
r
e
chan
g
e
th
e
unpack limit treshold
t
o a s
a
ner value
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-07
J
.
B
ruce
Fields
Doc
u
ment
a
tion: r
e
organiz
e
cvs
-
mi
g
ration
.
t
xt
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Junio C
H
amano
git-m
e
r
g
e
: fix "
f
ix conf
u
sion 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: avoid
n
etw
o
rk tim
e
outs for lon
g
-runn
i
ng fetches
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Ja
k
ub
N
arebski
gitweb: Allo
w
P
N
G, GIF
,
JPEG images t
o
be displayed
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Junio C Hamano
git-m
e
rge
:
squelc
h
ne
e
d
l
ess
error
m
essage
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Junio C Hamano
Merg
e
commit
|
commitdiff
|
tree
2006-12-06
J
u
nio
C
H
a
ma
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2006-12-06
Junio C Hamano
git-reset
t
o
remo
v
e "$GIT_DIR/MERGE_MSG"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
J
.
Bruce Fields
cvs-migration: improved section titles, better pus
h
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Johannes Schinde
l
in
cvs-migrat
i
on documen
t
: m
a
ke
the need
f
or "pus
h
" more
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-05
Jakub Nare
b
ski
Document git-d
i
ff whitespace f
l
ags
-b
and -w
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-05
Joh
a
nnes Schi
n
de
l
in
diff -b: ignore white
s
pace at en
d
of line
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-05
J
unio C Ham
a
no
Merge branch 'maint'
commit
|
commitdiff
|
tree
2006-12-04
Junio C H
a
mano
unpac
k
-tr
e
es
:
make
s
u
re "
d
f_conflict_
e
ntr
y
.
name"
i
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
Juni
o
C Hamano
receive-pack:
d
o not insist on fast-forward outside
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
M
ichael Loeffler
git-f
e
t
ch: ig
n
ore
d
e
ref
e
r
enced tag
s
in expand_refs
_
wildcard
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
Jakub
N
a
r
e
bski
gi
t
-clone:
R
ename -
-
use-immingled-remote option t
o
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
Jakub Narebski
gitweb: Fix Atom fe
e
d <logo>:
i
t is $l
o
g
o
, no
t
$log
o
_url
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
Alex
Riesen
Make per
l
/ build proc
e
dure Ac
t
ive
S
ta
t
e frie
n
d
ly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
D
avid Miller
P
a
ss -
M
to
di
f
f i
n
req
u
est-p
u
ll
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
Jim Meyering
Set
per
m
issio
n
s of eac
h
new file
b
e
fo
r
e "cvs add"ing it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
Johanne
s
Sc
h
ind
e
lin
git-m
v
: search m
o
re precisely for source directo
r
y
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Juni
o
C Hama
n
o
Merge branch 'ma
i
n
t
'
commit
|
commitdiff
|
tree
2006-12-03
Eric Wong
git-sv
n
: avoid fetching fi
l
es
t
wice in the sam
e
revisi
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Juni
o
C H
a
man
o
git-merge: fix confusion between tag a
n
d branch
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-02
Andy Parki
n
s
De-emphasise the
s
ymbol
i
c link documentation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-02
Andreas E
r
icss
o
n
git-di
f
f: Intro
d
u
c
e --index and deprecate --cac
h
ed
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-02
A
n
dre
a
s Eric
s
son
l
s
-files:
G
ive hin
t
s whe
n
errors happe
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-30
Nicolas Pitre
pa
c
k
-
objects
:
remove redun
d
ent status informat
i
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Junio C
H
a
man
o
Merg
e
master
.
kerne
l
.
org:/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2006-11-29
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2006-11-29
Andy Parkins
Do
c
ument
git-repo-config -
-
bo
o
l/--int options
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Junio C Hamano
tuto
r
i
al
:
t
a
lk about user
.
name
e
a
rly and do
n
't start
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Alex Ries
e
n
git
-
b
lame: fix rev pa
r
ameter han
d
ling
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Junio
C
Hamano
Me
r
ge
b
ranch 'jc/glob
f
etch'
commit
|
commitdiff
|
tree
2006-11-29
Junio C Haman
o
Merge
br
a
nch 'mai
n
t'
commit
|
commitdiff
|
tree
2006-11-29
Junio C Hama
n
o
git blame
-
C
: fi
x
output forma
t
tweaks whe
n
cross
i
ng
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Eric Wo
n
g
git-sv
n
:
f
i
x mul
t
i-ini
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Eric Wong
git-svn: documentation updates
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Eric Wong
git
-
s
v
n: co
l
or
su
p
po
r
t for the
l
og
c
o
m
mand
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Ha
n
-
Wen Nien
h
uys
iden
t
.
c: Trim hint printed
w
hen g
e
cos is
e
mpty
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
S
h
awn O
.
Pearce
Fix b
r
o
k
en
bash comple
t
ion of local
r
e
fs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
Shawn O
.
P
e
arce
Teach ba
s
h
h
ow to comp
l
ete long o
p
tions for git-commit
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
Eric Wong
git-svn: fix output reporting
f
r
o
m the delta fetcher
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
E
r
i
c
Wong
g
it-svn: error o
u
t when
t
he
S
VN connection fails during
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
René Scharfe
s
hortlog: remove r
a
n
g
e check
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
Eric Wong
git-svn: up
d
at
e
tests
for
recent changes
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
Eri
c
Wong
git-s
v
n: enable delta transfe
r
s
during fetches wh
e
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
Andy Parkins
Use
.
gi
t
/config for
storing "orig
i
n" shortc
u
t repository
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
J
ohannes S
c
hindelin
sha1_object_info(
)
: be consistent wi
t
h
r
ead_sha1_file()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
Johannes Schindelin
shortlog: us
e
p
ager
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Junio C
H
amano
cvsimport: style
f
ixup
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Eri
c
Won
g
git-svn: use ~/
.
sub
v
e
r
sion
config files when using
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
P
e
ar
c
e
Teach bash about git-a
m
/git-apply and thei
r
wh
i
tespace
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
Cache the li
s
t of me
r
ge st
r
ate
g
ies and available c
o
mmands
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
Support
--strategy=x c
o
mp
l
etion in a
d
diti
o
n to --str
a
tegy x
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shawn
O
.
Pearce
Teach bash about
git-repo-con
f
i
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
P
e
arce
Sup
p
ort bash completi
o
n of r
e
fs/remo
t
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Sh
a
wn O
.
Pear
c
e
Teach
ba
s
h about
g
it log/show
/
what
c
ha
n
g
ed opt
i
o
ns
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
S
hawn O
.
P
e
ar
c
e
Teach bash h
o
w to complete gi
t
-reba
s
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Sha
w
n
O
.
Pearce
Tea
c
h bash how
to complete git-cherr
y
-pic
k
.
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 g
i
t
-
format-patch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pe
a
rce
Add current
b
ranch in PS1
s
upport to git-compl
e
t
i
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
S
h
awn O
.
Pe
a
rce
Teac
h
bash how to complete options f
o
r
git-name-rev
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Sh
a
wn O
.
Pearc
e
H
i
de plumbing
/
tran
s
por
t
com
m
ands fr
o
m
bas
h
co
m
pletion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
Teach
g
it-completion
.
bash how to co
m
ple
t
e
gi
t
-merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Sean
Upda
t
e docume
n
tation to remove
i
ncorrect GI
T
_
D
IFF_OPTS
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Junio
C
Ha
m
ano
Mer
g
e branch 'js/shortlog'
commit
|
commitdiff
|
tree
next