repo.or.cz
/
egit
/
eclipse.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Improve error reporting for pull failures due to conflicts
2013-03-25
Ro
b
in Rosenberg
Improve erro
r
repo
r
ting
f
or
pull fa
i
lur
e
s due t
o
conflicts
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2013-03-24
M
a
tt
h
i
as Sohn
Update build to Tyc
h
o
0
.
17
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2013-03-24
Matthias Sohn
Ensure repositori
e
s are also closed i
f
an
exception
.
.
.
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2013-03-24
Tomasz Za
r
n
a
Fetch from Gerr
i
t s
h
ou
l
d allow to
be r
u
n in background
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2013-03-22
Laurent Go
u
b
et
Eliminate file handle le
a
ks
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2013-03-22
Matthi
a
s S
o
hn
Remove no long
e
r used AP
I
filt
e
rs
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2013-03-22
Mat
t
hias Sohn
Remove use o
f
i
n
t
e
rnal JGit c
l
a
s
s Fil
e
Reposit
o
ry
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2013-03-21
Robin Stocker
[historyV
i
ew] Adjust column weig
h
ts/width
s
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2013-03-21
Robin S
t
ocker
[histo
r
yView] Don't
show e-ma
i
l
addr
e
sses in table
.
.
.
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2013-03-21
To
m
asz Zarna
F
i
x since tags
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2013-03-20
An
d
ré
D
i
etisheim
A
ll
o
w users to sho
w
server messages while pushin
g
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2013-03-09
Robin St
o
cker
F
ix r
e
bas
e
pulldown in toolb
a
r
not being acc
e
ssi
b
l
e
.
.
.
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2013-03-08
Matthias Sohn
Update p2f f
i
l
e for
ins
t
alling tool
s
a
n
d
JGit/EGi
t
.
.
.
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2013-03-07
Tomas
z
Zarn
a
S
how fast forward mode
s
in Mer
g
e dialo
g
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2013-03-07
Robin Rosenberg
Move
U
IText and UIIcons to the inter
n
al
package
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2013-02-28
Robin Stocker
[stagingVi
e
w]
Improve
usability of "Replace
w
ith" on
.
.
.
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2013-02-24
M
a
tthia
s
Sohn
Deploy M
a
ven a
r
tifacts to Ecl
i
pse Ne
x
us r
e
p
o
sitory
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2013-02-21
Dani Mege
r
t
Place
'
Searc
h
for nested project
s
' closer to the projects
.
.
.
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2013-02-21
Matthi
a
s Sohn
Merge
b
ra
n
ch 'stable-2
.
3'
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2013-02-21
Matthias
S
ohn
Prepare 2
.
3
.
2-SNAPSHOT builds
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2013-02-21
M
atth
i
as Soh
n
EGi
t
v
2
.
3
.
1
.
20130220
1
838-r
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2013-02-20
Markus Keller
Workar
o
und
f
or
b
ug in StyledText#add
B
i
d
iSeg
m
entLi
s
te
n
er
(
.
.
)
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2013-02-13
Matthias Sohn
Prepare
2
.
4
.
0-SNAPSHOT b
u
ilds
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2013-02-13
M
a
t
t
h
ias
S
ohn
Merg
e
bran
c
h 'stab
l
e-2
.
3'
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2013-02-13
M
atthias Soh
n
Prepare p
o
st 2
.
3
.
0
.
201302130906 build
s
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2013-02-13
M
a
tthias Sohn
E
Git v2
.
3
.
0
.
2
0
13021
3
0906
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2013-02-13
Matthias Sohn
Update d
o
c
u
mentation for 2
.
3
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2013-02-12
Matthias Sohn
Auto-sh
a
r
e
projects lo
c
ated in a git repo
s
itory
b
y
.
.
.
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2013-02-12
Darius
z
Luks
z
a
Mark org
.
eclipse
.
de
b
ug
.
ui as optio
n
al dependen
c
y
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2013-02-11
Robin Stocker
R
e
member
"
S
e
a
rch fo
r
nested
p
rojects" che
c
kbox s
t
ate
.
.
.
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2013-02-11
Robin R
o
se
n
berg
Show error t
o
use
r
if staging
fails
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2013-02-11
Gunnar Wagenknecht
Chan
g
e table in
c
o
m
mit dialog
t
o filtered tree
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2013-02-08
Mat
t
hias
S
o
h
n
Mark
.
git team pr
i
vate when re-ma
p
p
i
ng
a reposi
t
ory
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2013-02-06
Robin Stocker
[his
t
oryView] Highligh
t
filtered f
i
les in fi
l
e
d
i
ff
.
.
.
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2013-02-06
Robin Stock
e
r
A
d
d
c
heckbox t
o
Impor
t
Projec
t
s
p
age for nested projec
t
.
.
.
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2013-02-06
Robin
S
t
o
cker
Pr
e
vent IO_F
A
ILUR
E
by checking for c
o
n
f
l
i
c
t
s in ref
.
.
.
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2013-02-06
M
a
tthia
s
Sohn
Pr
e
pare
p
ost 2
.
3 rc1 bui
l
ds
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2013-02-06
Matth
i
as
S
ohn
E
G
i
t v
2
.
3
.
0
.
201302
0
6
0
400-rc1
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2013-02-03
Robin Stock
e
r
O
n
ly return exis
t
ing IFile from getFile
F
orLoca
t
ion
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2013-02-03
Ste
f
an Lay
D
o not replace Change-Id in commit message in case
.
.
.
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2013-02-02
Rob
i
n Stocker
Make sure cancel of INDEX_D
I
F
F
_CACHE_UP
D
AT
E
j
o
b is
.
.
.
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2013-02-01
Robi
n
St
o
c
k
er
Sor
t
projec
t
s on
l
y
o
nce
i
n Proje
c
tU
t
il
.
getProjectsContaining
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2013-01-31
Fran
ç
o
i
s Rey
G
r
ace
f
ully igno
r
e linke
d
resources
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2013-01-28
Robin St
o
cker
[
r
epoView] Add
"
H
is
t
ory" t
o
Show In menu for all per
s
pectiv
e
s
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2013-01-20
Robin Sto
c
ker
[syncView] Use JobJoiner in
test to e
n
sure synchronize
.
.
.
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2013-01-17
Robin Sto
c
ker
[histo
r
yV
i
ew] Remov
e
v
i
ew setting actions from comm
i
t
.
.
.
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2013-01-16
Robi
n
Rosenberg
Reverse t
h
e two
o
p
en
e
n
tries in
t
he hist
o
ry filediff
.
.
.
commit
|
commitdiff
|
tree
2013-01-16
Robin
R
osenberg
A
d
d
trac
i
ng for properties testers
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2013-01-15
Robin Stocker
Re-ad
d
Ignor
e
Operation
constructor for IResour
c
e
[
]
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2013-01-15
Sn
j
ez
a
na Peco
C
an not de
l
ete git project
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2013-01-12
Matthias Sohn
R
evert "Support git --no-
f
f a
s
an EGit preferenc
e
"
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2013-01-09
Matthias Sohn
S
implify Eclips
e
setup for
EGit developers
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2013-01-03
Robin Stoc
k
er
Also en
a
ble Merge
Tool fo
r
conflicts
c
au
s
ed
by
stash
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2013-01-03
M
atthias S
o
hn
Fix brok
e
n UI tests
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2013-01-03
Robin Rosenberg
Improve p
r
e
c
is
i
on
of
d
etached hea
d
decoration
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2012-12-24
R
obi
n
Stocker
Fix NPE
w
ith withAllPropert
i
es in platform
.
team
<
3
.
8
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2012-12-21
Dan
i
Megert
Move
'Cancel' butto
n
to
the
right
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2012-12-20
Ma
t
thias So
h
n
Pre
p
are 2
.
3
.
0 builds
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2012-12-20
Matthias Sohn
Merge branch 'stable-2
.
2
'
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2012-12-20
Matthias S
o
h
n
P
rep
a
re
p
o
st 2
.
2
.
0
.
2012121
9
18
5
0-r
builds
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2012-12-20
Matthias So
h
n
EGit v2
.
2
.
0
.
2
01212191850-r
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2012-12-19
R
o
bi
n
Rosenberg
Suggest
HEA
D
versi
o
n in the
Mer
g
eTool
d
i
alog
commit
|
commitdiff
|
tree
2012-12-19
Robin
R
o
senberg
T
reat a
d
irty
wo
r
ktree like a
normal c
o
ndi
t
ion
commit
|
commitdiff
|
tree
2012-12-19
Robin Rosenberg
Sug
g
est HEAD versi
o
n in the MergeTool dialog
commit
|
commitdiff
|
tree
2012-12-19
Ro
b
in Rosen
b
erg
Treat
a d
i
rty worktree like a nor
m
al condition
commit
|
commitdiff
|
tree
2012-12-19
Mat
t
hias So
h
n
Update docu
m
entation f
o
r 2
.
2
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2012-12-19
R
o
bin Rosenb
e
rg
A
l
ert
u
ser
when Apply
Stash fails
commit
|
commitdiff
|
tree
2012-12-16
Matt
h
ias S
o
hn
Merge
b
ranch 's
t
ab
l
e-2
.
2
'
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2012-12-15
Matt
h
ias Sohn
A
dd
a
pache commons compress t
o
target platform
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2012-12-05
Robin St
o
cker
Fix ResourceUtil
.
getResourc
e
ForLocation returning folde
r
.
.
.
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2012-12-05
Ro
b
i
n
Stocker
Su
p
port filte
r
ed re
s
ources in ContainerTreeI
t
erator
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2012-12-05
Robin Stocker
Make R
e
move
F
romIndexOperat
i
on work
for multiple repositorie
s
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2012-12-05
R
o
bin
Stoc
k
er
Fix NPE accessing body o
f
Re
v
C
o
mmit
re
t
urned from
g
etC
o
mmonA
.
.
.
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2012-12-05
Ro
b
in Stocker
Try to make
r
epositories view
t
ests more sta
b
l
e
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2012-12-02
Markus
Duft
Refre
s
h o
n
ly
deltas to the last refr
e
sh in IndexDiffCach
e
E
ntry
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2012-12-01
Robin Stocker
A
dd test wi
t
h untracked
f
o
l
ders t
o
Ind
e
xDiffCacheTest
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2012-12-01
Robin Sto
c
ker
Make
a
ddT
o
Index test ut
i
l m
e
thod wor
k
w
i
th IResource
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2012-11-28
Robi
n
R
osenberg
I
n
cr
e
ase timeou
t
for UI tests
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2012-11-28
Ro
b
in
Ro
s
enberg
Red
u
ce memor
y
f
o
o
tprint
w
hen calc
u
latin
g
merge bases
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2012-11-27
R
obin R
o
se
n
berg
S
ort
t
he stash
e
d commits in th
e
G
it Reposito
r
y view
.
.
.
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2012-11-25
Matthi
a
s
Sohn
Mar
k
org
.
e
cl
i
pse
.
e
g
i
t
.
core bundle
to provide project
.
.
.
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2012-11-22
Robin
S
toc
k
er
Depend on org
.
eclip
s
e
.
core
.
runtime >= 3
.
7
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2012-11-22
Robin Sto
c
ke
r
Fi
x
index
diff re
f
resh in LocalNo
n
W
orkspaceTypedElement
.
.
.
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2012-11-18
Jens
B
a
umgar
t
Limit version range for d
e
penden
c
i
e
s in 'org
.
eclipse
.
.
.
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2012-11-16
Robin Stocker
[staging
V
iew] Add Show
In to context menu of files
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2012-11-11
Stefan Lay
U
s
e th
r
ee-way mode of
t
he compare
e
ditor
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2012-11-11
Robin Stoc
k
e
r
[repoView] Move g
e
tPath to Reposito
r
yTreeNode
a
nd subclasses
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2012-11-10
Robin Stocker
BranchRenameDial
o
g
: Te
s
t for invalid r
e
f
befo
r
e resolving it
commit
|
commitdiff
|
tree
2012-11-09
Robin Stocker
Abbreviate commi
t
ID in me
r
ge ed
i
tor labels
commit
|
commitdiff
|
tree
2012-11-09
Robin Stock
e
r
Updat
e
egit
.
psf
t
eam project set
commit
|
commitdiff
|
tree
2012-11-09
Robin Stocker
R
emove redunda
n
t an
d
illega
l
implementation
of IFileRevis
i
on
commit
|
commitdiff
|
tree
2012-11-09
Robin St
o
cker
Remove 3
.
5 (
G
alileo) and 3
.
6 (Hel
i
os) target
p
latforms
commit
|
commitdiff
|
tree
2012-11-09
Robin St
o
cker
Remov
e
no l
o
nger needed org
.
eclipse
.
egit
.
psf-fea
t
u
r
e
commit
|
commitdiff
|
tree
2012-11-08
Matthia
s
Sohn
Fix invalid not well-form
e
d plugin
.
x
m
l
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2012-11-04
Robin Stocker
CommitOperation: Han
d
le par
s
ePersonIdent returning
.
.
.
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2012-11-04
Robin Stocker
Su
p
press discou
r
a
ged
a
ccess warnings in te
s
ts
commit
|
commitdiff
|
tree
2012-11-04
Robin St
o
cker
Fix Replace With o
n
project when i
t
i
s th
e
root o
f
.
.
.
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2012-11-02
Tomasz
Z
arna
I
nstanceScope(
)
a
n
d DefaultScope() cons
t
ru
c
tors are
.
.
.
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2012-11-02
Gu
n
nar Wagenknecht
Pro
p
agate
p
roject text
l
abel de
c
ora
t
ion up
to workin
g
set
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
2012-10-27
André Dietis
h
eim
Allow users to push to upstream w
h
en comm
i
tting in
.
.
.
Signed-off-by:
Matthias Sohn
<matthias.sohn@sap.com>
commit
|
commitdiff
|
tree
next