repo.or.cz
/
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 Pearce
Remove unconteste
d
r
enamed files
during merg
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
J
u
nio
C
Hamano
Merge br
a
n
ch 'mai
n
t'
commit
|
commitdiff
|
tree
2006-12-13
Eri
c
Wong
g
i
t-svn: co
r
r
e
c
tly disp
l
ay fatal() error
messa
g
es
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Eric Wong
git-svn: e
x
it with status 1 for test f
a
i
l
u
res
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Andy Parkins
Allow subcom
m
and
.
color and color
.
subcommand c
o
lor confi
g
uration
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
J
u
n
i
o C Hamano
git-push:
document r
e
mo
v
al of re
m
ote ref with :<dst
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
E
r
ic Won
g
git-svn: correctly handle packed
-
refs in refs/rem
o
te
s
/
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Junio C
Ha
m
ano
Merge branch
'main
t
'
commit
|
commitdiff
|
tree
2006-12-13
Junio C
Hamano
a
d
d test case for recursive merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Er
i
c Won
g
g
it-svn: correctly
displa
y
f
at
a
l()
e
rror messages
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
Eric 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
W
on
g
git-svn: enabl
e
logging
of infor
m
a
tion not s
u
pport
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-13
A
l
e
x
Riesen
Clarify fetch err
o
r for missin
g
objects
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-12
Bri
a
n Gernhardt
Move Fink and Ports check to af
t
er con
f
ig fil
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
J
u
n
io C
H
aman
o
shortlog: fix
s
e
gf
a
ult o
n
empty authorname
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Junio
C Ha
m
ano
sh
o
rtlog: remove "[PAT
C
H]"
p
r
efix f
r
om sh
o
rt
l
og out
p
ut
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Juni
o
C Haman
o
Me
r
ge bra
n
ch '
m
aint'
commit
|
commitdiff
|
tree
2006-12-11
Shawn O
.
Pea
r
ce
M
a
ke sure th
e
em
p
ty tr
e
e e
x
ist
s
when needed in merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Jim
M
eyering
Don't use mem
c
py
wh
e
n source and dest
.
buff
e
rs may
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-11
Chr
i
s
W
right
no need to inst
a
ll manpages
as executable
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-09
J
.
Bruce Fields
Documentation: simpler shar
e
d
re
p
ository
creation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-09
Jeff Ki
n
g
sho
r
tlog:
f
ix seg
f
a
u
lt on empty
a
u
thorname
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-09
Jose
f
W
e
i
d
e
ndor
f
er
A
dd branch
.
*
.
merge warning
and
d
ocume
n
t
atio
n
up
d
ate
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-08
Junio C
H
a
mano
F
i
x pe
r
l/
b
uild
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-08
Eric Wong
g
i
t-svn: use do_switch for
--follow-par
e
n
t if the
S
VN
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-08
Uwe
Z
eisberg
e
r
Fix doc
u
mentation c
o
py&paste t
y
po
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-08
E
r
i
c Wong
git-svn: extra
e
rr
o
r check to ensure we open a
fil
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-08
J
.
Bruce Fields
D
o
cume
n
tation: update git-clone m
a
n pa
g
e with new
behavior
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-07
Junio C H
a
mano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2006-12-07
M
a
r
tin Langhoff
cvsserver: Avoid miscount
i
n
g bytes in Perl v5
.
8
.
x
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-07
Nic
o
las Pitre
change the unpack limit treshold to a saner value
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-07
J
.
Br
u
ce Fields
Docume
n
tation: reorganize c
v
s-migration
.
txt
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
J
u
nio C Hama
n
o
git-m
e
rg
e
: fix "fix co
n
fusio
n
b
etween tag
a
nd branch
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Eric Wong
git
-
svn: avoid ne
t
work
t
imeouts for long-r
u
nning fetc
h
es
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Jaku
b
N
a
rebski
g
i
tw
e
b: Allow
PNG, GIF, JPEG
i
mages to be dis
p
lay
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Ju
n
io C Ham
a
no
git-merg
e
: squelch need
l
ess error message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Junio C Ham
a
no
M
e
rge
commit
|
commitdiff
|
tree
2006-12-06
J
u
n
i
o
C Hama
n
o
Merge branc
h
'
m
a
i
nt'
commit
|
commitdiff
|
tree
2006-12-06
Junio
C Hama
n
o
git-re
s
et
t
o r
e
m
ov
e
"$G
I
T_DIR/MERGE_MSG"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
J
.
Bruc
e
Fields
cvs-migration:
improved
section
t
itles, better push
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-06
Johannes Schindelin
cvs-migration document
:
make the n
e
e
d
for "push" more
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-05
Jakub N
a
rebski
D
o
cume
n
t
git-diff whitespace fla
g
s -b and -w
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-05
J
o
h
ann
e
s Schin
d
elin
dif
f
-b: ignore whitespace at en
d
of line
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-05
Ju
n
io C H
a
mano
Merge bran
c
h
'maint
'
commit
|
commitdiff
|
tree
2006-12-04
J
unio C Hamano
unpack
-
tree
s
:
m
ake sure "df_c
o
nflict_entry
.
name" is
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
Junio
C
Hama
n
o
receive-pack: do
n
o
t
ins
i
s
t
on
f
ast-forward
o
utsi
d
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
Michael Loeffler
git-fetch: ignore dere
f
erenced tags in expa
n
d_r
e
f
s_wil
d
c
a
rd
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
Jak
u
b Na
r
e
bski
git-clo
n
e:
Rena
m
e --use-immingled-remote o
p
tion
t
o
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
J
a
k
u
b Narebski
gitweb: F
i
x
Atom feed <l
o
g
o
>: it is $log
o
, not $l
o
go_url
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
Alex Riesen
Ma
k
e perl/ build procedure ActiveState
f
r
i
endly
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
D
avid Miller
P
ass -M
to dif
f
in reque
s
t-pull
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
J
i
m
Meyering
Set
p
erm
i
ssions
of each new fi
l
e
b
efore "cvs add"ing it
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-04
J
oha
n
nes Schindelin
g
it-mv: search more
p
r
ec
i
sely
for
s
ource dir
e
ctor
y
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
Ju
n
io C Hamano
Merge b
r
a
nch 'maint'
commit
|
commitdiff
|
tree
2006-12-03
Eric
Wong
git-sv
n
: avoid fe
t
ching fil
e
s twice
i
n the same revision
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-03
J
u
nio C
Hamano
git-merge: f
i
x c
o
nf
u
sion
be
t
ween tag
a
nd
b
ranch
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-02
Andy Parkins
D
e
-empha
s
ise t
h
e symbolic link
d
ocumentation
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-02
A
n
d
reas Eric
s
so
n
git-
d
if
f
: Intr
o
duc
e
--index and depr
e
cate --cached
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-12-02
Andreas Ericsson
ls-file
s
: Give hints when errors happe
n
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-30
Nicolas Pitre
pack-objects: remove re
d
undent status
info
r
mation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Juni
o
C Hamano
Merge mast
e
r
.
kernel
.
org:/pub/sc
m
/gitk/gitk
commit
|
commitdiff
|
tree
2006-11-29
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2006-11-29
A
n
dy Pa
r
kins
Docu
m
ent git
-
r
e
po-config --bool
/
--int options
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Junio
C
Hamano
tutorial: t
a
lk about use
r
.
name early and
don't st
a
rt
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Alex Rie
s
en
g
it-blame: fix rev para
m
eter ha
n
dli
n
g
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Junio C Hamano
M
e
r
ge branch
'jc/globfetch'
commit
|
commitdiff
|
tree
2006-11-29
Junio C Hamano
M
e
rge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2006-11-29
J
u
nio
C
Ham
a
no
git blam
e
-
C
: fix ou
t
p
ut f
o
rmat tweaks
when
c
ros
s
in
g
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Eric
W
ong
gi
t
-s
v
n: f
i
x multi-init
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Eric
Wong
git-svn:
d
o
cumentation updates
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Eric W
o
ng
git-svn: color su
p
p
o
r
t for the log command
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-29
Han-Wen
N
ienhuys
ident
.
c:
T
r
i
m h
i
n
t
p
rinted when geco
s
i
s empty
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
Sh
a
wn O
.
Pea
r
ce
Fix b
r
oken bash completion of l
o
cal
refs
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
Shawn O
.
Pearce
Tea
c
h bash how
t
o complete l
o
n
g o
p
t
i
o
ns
for g
i
t-commi
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
Eric Wong
gi
t
-svn:
f
ix output
reporting
f
ro
m
t
h
e
delt
a
f
e
tcher
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
Eri
c
Wong
git-svn: error out
when
t
he SVN conne
c
tion
fa
i
ls during
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
René Scharfe
short
l
og: r
e
m
ove range check
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
Eric
W
ong
g
i
t-svn:
update tests for recent changes
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
Eric W
o
ng
git-
s
vn
:
enable delta trans
f
ers during fet
c
hes when
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
A
n
d
y
P
arkins
Use
.
git/config for st
o
ring "or
i
gin" shortcut reposi
t
ory
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
Johannes Sc
h
indelin
s
h
a
1
_ob
j
ect_info
(
): be consiste
n
t
wi
t
h read_sha1_file()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-28
Johan
n
es Schindelin
shortl
o
g: use pager
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Junio C
Hamano
cvs
i
mport: style f
i
xup
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Eric Wong
git-s
v
n: use ~/
.
s
ubversion
c
o
nf
i
g
files wh
e
n using
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Sh
a
w
n
O
.
P
e
arce
Teach bash a
b
out git-am/git-app
l
y and their w
h
ites
p
ace
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Sha
w
n O
.
Pearce
Cache the list of merge strateg
i
es and available commands
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
P
e
arc
e
Support --
s
trategy
=
x completion in addition t
o
--strategy x
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
Teach bas
h
abo
u
t git-re
p
o-config
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Sha
w
n O
.
Pea
r
ce
Support bash completion
o
f r
e
fs/remot
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pear
c
e
Teach bash abou
t
git log/s
h
ow/whatchange
d
optio
n
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
S
h
a
w
n O
.
Pearce
Teach bash h
o
w to c
o
mplete git
-
rebas
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
S
hawn O
.
Pearce
Teac
h
bash how to complete git-c
h
e
rry-pick
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearce
Teach
bash how
t
o complet
e
git-fo
r
mat-p
a
tch
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Sha
w
n O
.
P
ea
r
ce
Add current branch in PS1 s
u
pport to
g
it-compl
e
tion
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Sha
w
n O
.
Pearce
T
e
a
ch bash how to complet
e
options for
git-name-rev
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
Pearc
e
Hide plumbing/transport comm
a
nds from bash comple
t
ion
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
Shawn O
.
P
e
a
r
ce
Teach
g
it-co
m
pletion
.
bash how to complete
git-merge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
S
ea
n
Update do
c
umentation to remove incorre
c
t
GIT_DI
F
F_OPTS
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-11-27
J
unio C Hamano
Merge branch '
j
s/shor
t
log'
commit
|
commitdiff
|
tree
2006-11-27
J
un
i
o C
H
ama
n
o
Merge branch 'jc/push-delete-ref'
commit
|
commitdiff
|
tree
next