repo.or.cz
/
alt-git.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
Shawn
P
e
a
r
c
e
Remove uncontested renamed files during
merge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hamano
M
er
g
e branch 'maint'
commit
|
commitdiff
|
tree
2006-12-13
E
r
ic
Wo
n
g
git-svn:
correctl
y
display fatal() error mes
s
ages
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Eric W
o
ng
gi
t
-svn: ex
i
t with status 1 for test failure
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Andy Parkins
Allow subcomm
a
nd
.
co
l
or and color
.
subco
m
mand
c
o
l
or conf
i
gura
t
ion
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Juni
o
C Hama
n
o
gi
t
-push: document remov
a
l of
r
emot
e
ref with :<ds
t
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Eric Wong
git-svn
:
c
orrectly
h
a
ndle packe
d
-refs
in refs/
r
emotes/
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Junio C Hama
n
o
Merge branch
'maint'
commit
|
commitdiff
|
tree
2006-12-13
Juni
o
C Hamano
add test case for recursive
m
erge
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
E
r
i
c
Wong
git-svn
:
cor
r
e
c
tly
d
isplay fatal()
error
m
essage
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Eric
W
ong
git-svn: allow
dcomm
i
t to take an al
t
ernate head
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
E
r
ic
W
on
g
g
i
t
-svn:
enable logging of i
n
form
a
tion n
o
t su
p
ported
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-13
Alex
R
iesen
C
larify fetch error f
o
r missin
g
objects
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-12
Brian Ger
n
h
ardt
Move Fink and Ports check to
a
fter co
n
f
ig file
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-11
Junio
C
Hamano
shortlog: fix segfaul
t
on empty authorname
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-11
Junio C Haman
o
s
h
ortlog: remov
e
"[PATCH]" prefix fr
o
m shortlog o
u
t
p
ut
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-11
Juni
o
C
Hamano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2006-12-11
S
hawn O
.
Pearce
Make sure the empty tre
e
e
x
ists
w
hen needed in merge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-11
Jim Meye
r
i
n
g
D
o
n
't use m
e
mcpy when
sou
r
c
e
a
nd d
e
st
.
buffers may
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-11
Chris W
r
ight
no
need to ins
t
all
m
anpages as ex
e
cutable
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-09
J
.
Bruce Fields
Documen
t
ation: s
i
mpler shared reposit
o
ry cr
e
ati
o
n
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-09
Jeff
K
ing
sh
o
r
t
log: fix segfault on empt
y
auth
o
rname
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-09
Jos
e
f
Weidendorf
e
r
Ad
d
branch
.
*
.
m
e
rge w
a
r
n
ing and do
c
umen
t
ation
update
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-08
Junio C H
a
m
a
no
Fix perl/ build
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-08
Eri
c
Wong
gi
t
-svn: use
d
o_switch for --fo
l
low-parent if t
h
e SVN
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-08
Uwe Zei
s
ber
g
e
r
Fix docume
n
tation copy
&
paste t
y
p
o
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-08
Eri
c
Wong
git
-
svn: ext
r
a error c
h
eck to
ensure we
o
pen a file
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-08
J
.
Bruce
Fields
Documentation
:
update
g
it-clone man page 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 Hamano
Merge
b
ranch
'
maint'
commit
|
commitdiff
|
tree
2006-12-07
M
a
rtin L
a
n
g
hoff
c
vsserver: A
v
oid miscounti
n
g
bytes in P
e
rl v5
.
8
.
x
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-07
N
icolas Pitr
e
chang
e
th
e
unpack limit
tres
h
o
l
d to a saner value
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-07
J
.
Bruce Fie
l
ds
D
o
cum
e
ntation:
r
eor
g
anize
c
vs-migration
.
txt
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
Junio C Hama
n
o
git
-
m
e
r
ge:
f
i
x "fix co
n
fusion between tag and branch
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
Eric
Wong
git-svn
:
avoi
d
network
t
i
meouts for
l
ong-run
n
ing fe
t
ches
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
Jaku
b
Narebski
g
it
w
eb: Allow PNG, GIF,
J
P
E
G i
m
ages to be
dis
p
laye
d
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
Junio C Hamano
git-merge: s
q
uelch n
e
edl
e
s
s
error m
e
ss
a
ge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
Junio C Hamano
Merge
commit
|
commitdiff
|
tree
2006-12-06
Junio C Ham
a
no
Merge b
r
anch '
m
a
int'
commit
|
commitdiff
|
tree
2006-12-06
Ju
n
io C Hamano
git-re
s
et to
r
emove
"$GIT_DIR/MERGE_MS
G
"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
J
.
Bru
c
e Fi
e
lds
c
vs-migratio
n
: improved section
titl
e
s
,
better p
u
sh
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-06
Johann
e
s
Schi
n
delin
cvs-migra
t
ion do
c
u
me
n
t:
m
ake the need for "push" more
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-05
Jaku
b
N
a
r
ebs
k
i
Document
g
it-diff
whitespace
f
lags -b and -w
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-05
Johannes Schi
n
delin
d
if
f
-
b
: ignore w
h
ite
s
pace at end o
f
line
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-05
Junio
C
Hamano
Merge
bran
c
h
'maint'
commit
|
commitdiff
|
tree
2006-12-04
Ju
n
io
C Hamano
unp
a
ck-trees: make sure
"
df_c
o
nfli
c
t_ent
r
y
.
n
a
me" is
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-04
Juni
o
C Hamano
rec
e
ive-
p
ack: do not insist on fas
t
-for
w
ard outside
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-04
M
i
chael Loeffler
git-fet
c
h: ignore
d
ere
f
erenced ta
g
s in e
x
pand_refs_wildcard
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-04
Jakub Na
r
ebski
g
i
t
-c
l
one: Rename
--us
e
-immingled-re
m
ote op
t
ion to
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-04
J
a
ku
b
N
a
rebski
gi
t
w
e
b
:
F
i
x Atom fee
d
<logo>
:
it is $l
o
go, not $logo_url
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-04
Alex Rie
s
en
Ma
k
e perl/ build
p
rocedure ActiveS
t
ate f
r
ie
n
dly
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-04
David Mille
r
Pass -M
to d
i
ff
in request-
p
ull
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-04
Jim Meyering
Set permission
s
of each n
e
w
f
ile b
e
fore
"cvs add
"
ing i
t
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-04
Johannes Schindelin
g
i
t
-
mv
:
search m
o
r
e
preci
s
ely for source di
r
ectory
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-03
Junio C Hamano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2006-12-03
E
r
ic Wong
g
it-
s
vn: avoid fe
t
ching files twice in the same revision
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-03
J
u
nio C Hama
n
o
git-merge: fix confusion bet
w
een tag and branch
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-02
Andy Parkins
De-em
p
h
asise the symbolic
link documentation
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-02
Andreas Ericsso
n
git-diff: Introduce --index
and deprecate --cached
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-12-02
Andr
e
as E
r
icsson
ls-files
:
Give hints when errors happen
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-30
Nicolas Pitre
pack-objects: r
e
move redundent st
a
t
us information
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
J
u
nio
C H
a
mano
M
e
r
g
e
mas
t
er
.
kerne
l
.
org
:
/p
u
b
/s
c
m/gitk/
g
itk
commit
|
commitdiff
|
tree
2006-11-29
Junio
C
Ham
a
no
M
e
rge bra
n
ch 'm
a
int'
commit
|
commitdiff
|
tree
2006-11-29
Andy P
a
rkins
Document g
i
t-repo-conf
i
g --bool/--int option
s
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
Ju
n
io C H
a
ma
n
o
t
u
torial: t
a
lk abou
t
user
.
name
e
arly and
don't start
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
A
lex R
i
esen
git
-
blame
:
fix rev pa
r
ameter handling
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
Jun
i
o
C
H
amano
Merge branch 'jc/globfetch'
commit
|
commitdiff
|
tree
2006-11-29
Juni
o
C Hamano
M
erge branch 'maint
'
commit
|
commitdiff
|
tree
2006-11-29
Junio C
Ham
a
n
o
g
i
t b
l
ame -C:
f
i
x output format
twe
a
ks wh
e
n cr
o
ssing
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
Er
i
c
W
o
n
g
git-
s
v
n: f
i
x
m
ulti-init
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
E
ric
Wong
git
-
s
v
n: docum
e
ntation updates
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
Eric Won
g
git-sv
n
: color support f
o
r
t
he l
o
g
c
om
m
and
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-29
Han-Wen Nienhuys
i
dent
.
c: Trim hint printed w
h
en gecos is
e
m
pty
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-28
Shaw
n
O
.
Pearce
F
ix broken bash co
m
p
l
etion of l
o
cal refs
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-28
Shawn O
.
Pearce
T
e
a
ch
b
ash how t
o
complete long options for
git-commit
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-28
Eric Wong
gi
t
-s
v
n: fix o
u
tput reporti
n
g
f
rom the delta fetcher
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-28
Eric
Wong
git-svn: error out when the SV
N
connection
f
ails durin
g
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-28
René Sch
a
rfe
s
hortlog: remove range
c
he
c
k
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-28
Eric Wong
git-
s
v
n
:
update tests
for recent changes
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-28
Eric Wo
n
g
git-s
v
n
:
enable d
e
lta tran
s
fers
d
u
r
i
ng fetches wh
e
n
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-28
Andy Parkin
s
Use
.
git/config for storin
g
"origin" shortcut
repository
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-28
Johann
e
s Schindelin
sha1_
o
b
j
ect_info():
be
c
o
n
sistent w
i
th read_sha1_fi
l
e()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-28
Joha
n
nes Schindelin
sh
o
r
tlog:
u
se pager
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
J
u
nio C Haman
o
cvsimport
:
style fi
x
up
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
E
ric Wong
git-svn: use ~/
.
subv
e
rsion config
files when using
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
S
hawn O
.
Pearce
Teach bash abou
t
git
-
am/git-apply and
th
e
i
r
whitesp
a
c
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
P
e
a
r
c
e
Cache th
e
list of merg
e
strat
e
gies and available commands
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Sha
w
n
O
.
P
e
arce
S
u
p
port --s
t
rategy=x completi
o
n
i
n additio
n
to --stra
t
egy x
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Shawn
O
.
Pearc
e
Teach bash about git-repo-c
o
nfig
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
P
earce
Support
b
a
sh completion of
r
e
fs/remote
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
S
h
a
w
n O
.
P
earce
Tea
c
h bash
a
b
out git lo
g
/show
/
whatcha
n
ged options
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Shawn
O
.
Pearce
Te
a
ch bash how to complete g
i
t
-
re
b
ase
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
P
ear
c
e
Te
a
ch bash ho
w
to co
m
p
let
e
gi
t
-
c
herry
-
pick
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
S
hawn O
.
P
e
a
r
ce
Teach bash ho
w
to com
p
lete git-for
m
at-patch
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
S
hawn
O
.
Pearce
Ad
d
current branch in
P
S1 support to git-completion
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
P
earce
Teach bash how to complete options f
o
r g
i
t-name-rev
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
Hide pl
u
mbi
n
g/tr
a
nsport comma
n
ds fro
m
bash
compl
e
tion
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Sh
a
wn
O
.
Pearce
Teach git-compl
e
tion
.
b
ash ho
w
to complete git-merge
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Sean
Upd
a
te do
c
u
m
e
n
tat
i
on to remove incor
r
ect GIT_DIFF_O
P
T
S
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-11-27
Junio C Hamano
Merge bran
c
h
'
j
s
/shortlog'
commit
|
commitdiff
|
tree
2006-11-27
Junio C Haman
o
Merge
b
ranch 'jc/
p
u
s
h-delete-re
f
'
commit
|
commitdiff
|
tree
next