repo.or.cz
/
TortoiseGit.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Fixed issue #2785: Rebase/Cherry-pick with conflict in renamed file fails
2016-06-22
Sven Strickroth
Fix
e
d is
s
u
e
#27
8
5: Rebase/
C
herr
y
-pick with conf
l
i
ct
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-06-19
Sven
Strickroth
Make more clear not
to en
a
bl
e
any hack for the Git
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-06-19
Sven
S
t
rickroth
Merge branch 'rename-abbr
e
via
t
ion'
commit
|
commitdiff
|
tree
2016-06-19
Sve
n
S
trickroth
Fixed iss
u
e #2
7
7
3: Dire
c
tory re
n
ame s
h
ould be displ
a
yed
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-06-19
S
ven
S
trickroth
Ad
d
tests
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-06-19
Sven St
r
ickroth
Moved
r
e
n
a
m
e
a
b
breviation co
d
e
to
CTG
i
tPath
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-06-18
S
ven
St
r
ickr
o
th
Fil
e
DiffDlg
:
Fix blame
of added/deleted/renamed
f
iles
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-06-18
Sven Strickr
o
th
Pulled diff
and log options
m
ixed up
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-06-18
S
ven S
t
ric
k
roth
Drop
u
nneeded
r
eference
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-06-18
Sve
n
Stri
c
kroth
Fi
l
eDiff
D
lg: Switch Version 1 and Ver
s
ion 2
(Base)
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-06-13
Sven
S
trickroth
Fi
x
ed
issue #2783: "Dele
t
e and ad
d
to igno
r
e l
i
st
"
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-06-06
Sven Strickrot
h
Fixed
i
ssue
#
2
774: Pull dialog with
R
ussian Lan
g
Pack
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-31
Sv
e
n Strickroth
Update
l
ib
g
i
t
to 2
.
8
.
3
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-23
Sven
Strickroth
Re-registe
r
systray icon
a
fte
r
e
x
plorer
.
e
xe restart
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-17
Sven
S
tr
i
ckroth
Merge branch 'modality'
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-17
Sven Strickroth
Fi
x
modality o
f
message boxes
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-17
Sup Yut Sum
Fix CMessageBox with
default text not modal
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-17
S
u
p
Yut Sum
Fix C
M
essageBox not modal
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-14
Sven St
r
ickroth
Add bo
r
der-size
d
p
addin
g
for tree vie
w
items in Rep
o
sitory
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-14
Sven Strickroth
Create shell
t
ray ic
o
n after we sta
r
ted Co
m
man
d
WaitThread
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-12
S
ven Strick
r
o
th
Make sure the str
i
ng is not used as a format st
r
ing
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-11
Sven Strickroth
U
p
date l
i
bgit2
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-08
S
v
en Strickroth
Update l
i
bgit to 2
.
8
.
2
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-07
S
v
e
n Str
i
ckro
t
h
D
r
op checks fo
r
unsupported
g
it versio
n
s
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-07
Sven Strickroth
Increase timeo
u
t
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-07
Sv
e
n
Strickroth
Fixed i
s
sue #2772:
C
ompa
r
ing with a
d
ded fil
e
migh
t
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-06
Sven
S
trickroth
Fix some links
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-05
Sven Stric
k
roth
Upd
a
te git
documentation
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-05
Sv
e
n Strickroth
M
e
rge b
r
a
n
c
h 'scintilla
-
365'
commit
|
commitdiff
|
tree
2016-05-05
Sv
e
n St
r
ickrot
h
Appli
e
d
backgroundcol
o
rs
.
pa
t
c
h
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-05
Sven S
t
rickroth
Update Scintilla
to
version 3
.
6
.
5
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-05
Sven St
r
ickro
t
h
Add LruCac
h
e fo
r
spell checker
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-05
Sven Strickr
o
th
Perform
s
tyling
a
nd spe
l
l checki
n
g in SCN_STY
L
ENEEDE
D
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-04-30
Rick Burgstaler
Tests: Fix dependency
on user setting
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-04-22
Sven S
t
ri
c
k
roth
Revert commit acc
4
e7
5
4731fdab82753e
d
f9f
d
3776886443b8
4
0
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-04-22
Sven
Strickroth
Improve
r
eada
b
ili
t
y o
f
version
string
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-04-22
Sven Stri
c
kroth
Include l
o
a
ded languag
e
p
ack into crash r
e
port
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-04-22
Sven Strick
r
o
th
Port some fixes from
G
it for
W
i
ndows
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-04-22
Sv
e
n
S
tric
k
roth
g
e
t_windows_home_di
r
ectory m
i
g
h
t p
o
int to wro
n
g
bu
f
f
e
r
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-04-20
Sven Strickro
t
h
Use T
a
skDialog if p
o
ssible
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-04-20
S
ven
S
trickroth
U
se default MessageBox if we don't use spe
c
ial butto
n
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-04-15
Sven Stri
c
k
r
oth
Vert
i
cally center text if i
c
on is shown
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-04-15
Sven Stri
c
kroth
Fix po
s
itioni
n
g of icon
i
n
CMessageBox
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-04-15
Sven Stric
k
roth
R
e
p
lac
e
auto_ptr w
i
th
u
nique_ptr
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-04-15
Sven
St
r
ickr
o
th
Fixed issue
#2759
:
Swapped
T
HEIRS and MINE
i
n cher
r
y
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-04-05
Sv
e
n Strickroth
Update libg
i
t to version 2
.
8
.
0
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-04-01
Sven St
r
ickroth
Sync with Torto
i
seSVN
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-31
Sv
e
n Strickroth
V
a
riable must be volatile a
s
it's use
d
in multiple
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-31
Sven S
t
rickroth
Sm
a
ll performance improvem
e
nt
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-29
S
v
e
n
S
tric
k
rot
h
Add Persian l
a
n
guage pack
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-29
Sven S
t
rickro
t
h
Fix
cloning an empty CEnvironment
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-28
Sve
n
S
trickroth
Get
rid of stdstring and wi
d
e_string
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-28
Sve
n
Strickroth
lib
g
it
2
.
7
.
4
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-28
Sven S
t
rickroth
Se
p
a
r
ate li
b
git
e
nvironment from the o
u
ter process
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-28
Sven
S
tric
k
roth
Add test against issue #2225
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-28
Sve
n
St
r
ick
r
oth
Don't fail
t
e
s
t b
a
sed on
u
s
er settings
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-27
Sven Strickrot
h
Add v
i
rt
u
a
l
des
t
r
u
ctors
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-27
Sven Strickroth
Unicod
e
processes must always pass CREATE_UNICODE_ENVIRO
N
MEN
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-27
Sve
n
Strick
r
ot
h
Ad
d
Crea
t
eProcessHelper
to p
r
oject
s
where necessary
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-27
Sve
n
Strickroth
Use a fixed pointer pointing to the
c
u
r
rent
versio
n
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-27
S
ven
Strickro
t
h
M
e
rg
e
b
ranch 't
g
it-22'
commit
|
commitdiff
|
tree
2016-03-26
Sven
S
t
ric
k
roth
Fix possible crash if
g
it config is broken
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-26
Sven Stric
k
roth
Merge branch 'tgit-2
.
1'
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-26
Sven Stric
k
roth
Prepare release and bump v
e
rsio
n
numbers to 2
.
1
.
0
.
0
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-26
Sven S
t
rickro
t
h
Sync
t
ransl
a
tion
s
w
ith
Transifex
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-26
Sve
n
Strickroth
Update spell checker
dictionaries
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-26
Sven St
r
ickroth
U
pdate li
b
git to 2
.
5
.
5
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sve
n
Strickr
o
th
Add note to
a
u
t
o
l
ist
.
txt and improve n
o
te in sn
i
ppet
.
t
xt
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sven Strickroth
Autolist p
a
rser: Ign
o
r
e
empty lines a
n
d
s
k
ip commen
t
s
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sven Strick
r
oth
Better indicate which is
t
h
e
base revision
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sven Strickroth
Rever
t
comm
i
t acc4e754731fdab82753
e
d
f
9fd3776886443b840
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sven Strickro
t
h
Fix possible cra
s
h
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
S
v
en Strickroth
Fix asser
t
ion error i
n
libgit
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sven Strickroth
Don't
e
nab
l
e
Edit
.
tgi
t
config if we
don't have
a repo
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sven Strickroth
Fix warnings
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sven
S
t
r
i
c
kro
t
h
Use AppendFormat
a
nd prevent usage of
t
em
p
orary strings
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sven Strickroth
Drop code
w/o function
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sven Stric
k
roth
Prevent the c
r
eation of intermediate
o
bj
e
cts
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sven Stri
c
kroth
Use r
a
ndom b
o
u
ndary
i
n mails
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sv
e
n Strickroth
Correctly encode mai
l
s
ubject and se
n
der nam
e
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sven Strickroth
U
s
e
.
empty() inste
a
d of size() >= 0
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sv
e
n Strickroth
Do not u
s
e 0
if we can u
s
e n
u
llptr
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sve
n
Stric
k
rot
h
P
a
ss FI
L
E_ATTRIBUTE_NORMAL
to
C
r
e
a
teFile
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sven Strickroth
Drop unneeded braces and empty lines before or after
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sven Strickroth
Use
.
Empty() on CS
t
ring instead of setting it
to L""
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sven Strickroth
D
r
op
u
nused code
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sven Strickroth
U
pdate
l
ibgit2 to version
0
.
2
4
.
0
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
S
v
en Strick
r
o
t
h
Merge branch 'sc
i
ntilla
-
364' into
tgit-2
1
commit
|
commitdiff
|
tree
2016-03-25
Sven Strickro
t
h
Applie
d
backgroundcolors
.
patch
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sven Stri
c
kroth
Update scintilla
t
o vers
i
on 3
.
6
.
4
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sv
e
n
Strickroth
Fix warni
n
gs
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sven Strickroth
Improve
su
p
port for P
r
ogramData config
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sven Strickroth
Also support nested quotes and quoted mai
l
addres
s
e
s
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sven Stri
c
kro
t
h
Deduplic
a
te cod
e
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sven Strick
r
oth
Corre
c
tly se
n
d
m
ail
whi
c
h cont
a
in
a si
n
gle
d
ot on a
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-23
Sven Strickro
t
h
Fixed issue #2715
:
C
annot comm
i
t with a com
m
i
t
me
s
sage
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-23
S
ven Strickr
o
th
Fixed iss
u
e
#
2728: Ch
e
rry Pick is
no
t
working in ca
s
e
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-23
Yu
e
Lin
Ho
Fix
e
d issue #27
4
0
:
Order of
compared referenc
e
s i
n
.
.
.
commit
|
commitdiff
|
tree
2016-03-23
Sven
Strickro
t
h
When sav
i
ng the file,
allow acc
e
ss to the file whil
e
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-23
Sven Strickroth
Dedupli
c
a
t
e
code
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
next