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 Strickrot
h
F
ixed is
s
ue #2785: Re
b
ase
/
C
h
e
rry-pick with co
n
flict
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-06-19
Sv
e
n Stric
k
roth
Mak
e
more clear not to enable any hack for
the
G
it
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-06-19
S
ven
S
tr
i
ckroth
Merge
b
ranch 'rename-abbr
e
viation'
commit
|
commitdiff
|
tree
2016-06-19
Sven
Strickr
o
t
h
F
ixed issue #2
7
73: Directory re
n
am
e
shou
l
d b
e
displayed
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-06-19
Sven Strickroth
Add test
s
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-06-19
Sve
n
St
r
ickroth
Moved
r
ename abbrevi
a
tion code to CTGitPath
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-06-18
Sv
e
n Strickroth
Fi
l
e
D
iffD
l
g:
F
ix blame
of added/
d
e
l
e
t
ed/
r
e
named files
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-06-18
S
v
en Strickrot
h
Pu
l
led
dif
f
a
n
d
l
o
g options m
i
xed up
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-06-18
Sven St
r
ickroth
Dro
p
unne
e
d
e
d refer
e
nce
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-06-18
Sven
Stric
k
roth
FileDiff
D
l
g
: Sw
i
tch Version 1 and Vers
i
on 2
(
B
ase)
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-06-13
Sven Strickrot
h
Fixed issue #2783: "Delete and add
to ignore li
s
t"
.
.
.
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 wit
h
Russia
n
L
angPack
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-05-31
Sven
S
tr
i
ckroth
Upd
a
t
e libgit
to 2
.
8
.
3
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-05-23
Sv
e
n
Stric
k
roth
R
e
-register
systra
y
i
c
on after explor
e
r
.
exe rest
a
rt
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-05-17
S
v
e
n
St
r
ickroth
Mer
g
e br
a
nch 'modality'
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-05-17
Sv
e
n Strickroth
Fix modality
of message boxes
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-05-17
Su
p
Yut Sum
Fi
x
CMessageBox
with default
t
ext not mod
a
l
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-05-17
Sup Y
u
t
Sum
Fix CMessage
B
ox not modal
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-05-14
Sven Stric
k
ro
t
h
Add
bord
e
r-sized padding for tree view items in R
e
po
s
itory
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-05-14
Sven Strickrot
h
Create shell tray icon after we started Comm
a
ndWaitThread
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-05-12
Sven Strickrot
h
Make
sure the str
i
ng
i
s not used
a
s
a
for
m
at string
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-05-11
S
v
e
n Strick
r
oth
Update
l
ib
g
it
2
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-05-08
S
ven Strickroth
Update
libgit to
2
.
8
.
2
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-05-07
S
v
en Strick
r
oth
Drop
c
hecks for
uns
u
p
p
orted git versions
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-05-07
Sven Strickroth
Increase time
o
ut
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-05-07
S
ve
n
Strickrot
h
F
ixed i
s
sue #2772: Compa
r
ing w
i
th ad
d
ed file m
i
ght
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-05-06
Sven Strickroth
Fix some links
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-05-05
S
ven Strickroth
Up
d
at
e
gi
t
doc
u
mentati
o
n
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-05-05
Sven Strickroth
M
e
rge branch 'scintilla-365'
commit
|
commitdiff
|
tree
2016-05-05
S
v
en Str
i
ckrot
h
Applied back
g
round
c
ol
o
rs
.
pa
t
c
h
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-05-05
Sven Stri
c
kroth
Updat
e
Scintilla to version 3
.
6
.
5
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-05-05
Sven Strickr
o
th
Add LruCach
e
for spell checker
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-05-05
Sven Strickroth
Perform s
t
yling and
spell checking in SC
N
_STY
L
ENEEDED
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-04-30
Rick Burgstaler
Tests:
F
ix dependency
o
n us
e
r setting
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-04-22
Sven
Strickroth
Rev
e
rt commit
acc4e754731fdab
8
2
7
53edf
9
fd3776886
4
43b840
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-04-22
Sven
S
trickroth
Improve readabi
l
ity of
v
ersion string
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-04-22
Sven
Strickr
o
t
h
Include loaded language pack
into crash report
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-04-22
Sven Strickr
o
th
Po
r
t some fixes fr
o
m
Git for Windows
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-04-22
Sven Strickroth
g
et_wind
o
ws_home_directory might point to wrong b
u
ffer
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-04-20
S
ven Stri
c
kroth
Use TaskDi
a
log if possible
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-04-20
Sven Strickroth
Use default MessageB
o
x
if
we don't
u
s
e
s
p
e
cia
l
button
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-04-15
Sven St
r
ickroth
Vert
i
cal
l
y center te
x
t if icon
i
s shown
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-04-15
Sven Strick
r
oth
Fix positio
n
ing of i
c
o
n in CMes
s
ageBox
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-04-15
Sven
S
t
r
ickroth
Repl
a
ce auto
_
ptr with uniq
u
e_ptr
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-04-15
Sve
n
Strickroth
Fixed issue
#
2759: Sw
a
pped THEIRS an
d
MINE in cher
r
y
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-04-05
Sven Strickroth
Up
d
ate libgit to versio
n
2
.
8
.
0
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-04-01
Sv
e
n Strickroth
Sync with TortoiseSVN
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-31
Sv
e
n Stri
c
kroth
Variable must be volatile
as it'
s
used in mu
l
t
iple
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-31
Sven Strickr
o
th
Sm
a
ll
p
erforma
n
ce improvemen
t
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-29
Sven
S
t
r
ickroth
Add Persia
n
l
ang
u
age pack
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-29
Sven Strick
r
oth
Fix clo
n
ing an empt
y
C
Environme
n
t
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-28
S
v
en Strick
r
oth
G
e
t rid of
stdstring and
wide_string
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-28
Sven Str
i
ckroth
libgit 2
.
7
.
4
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-28
Sven Strickroth
Separate li
b
git environment from the
o
uter process
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-28
Sven Stri
c
kroth
Ad
d
tes
t
against issue #2225
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-28
Sven St
r
ickroth
Don't fail tes
t
b
ased on user settin
g
s
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-27
Sven Strickroth
A
d
d virtual destru
c
tor
s
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-27
S
ven
Strick
r
oth
Unicode process
e
s must always pass CREATE_UN
I
CODE_E
N
V
I
RONME
N
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-27
Sven Strickroth
Add C
r
ea
t
e
P
r
ocessHelper
t
o projects wher
e
n
ecessary
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-27
Sven S
t
ric
k
roth
Use a f
i
xe
d
point
e
r pointing to the curr
e
nt versio
n
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-27
Sven
S
tr
i
ckroth
Merge branch '
t
git-22'
commit
|
commitdiff
|
tree
2016-03-26
Sv
e
n Strickroth
Fix possible cr
a
sh if git co
n
fig is br
o
ken
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-26
Sven
S
t
ri
c
kroth
Merge branch 'tg
i
t-2
.
1'
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-26
S
v
en Strickro
t
h
Prepare rele
a
se and bump ve
r
sion n
u
mbers to 2
.
1
.
0
.
0
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-26
Sven Strickroth
Sync trans
l
a
tion
s
with
Tra
n
sifex
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-26
S
v
en Strickroth
Up
d
ate
s
pell checker d
i
ctionaries
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-26
Sven Str
i
c
k
r
oth
Up
d
a
te libgit to 2
.
5
.
5
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-25
Sven S
t
rickroth
Add note to autolis
t
.
txt and improve not
e
in
s
nippet
.
txt
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-25
S
ven Str
i
ckrot
h
Au
t
olist par
s
e
r: Ignor
e
empty lin
e
s and
s
kip comm
e
nts
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-25
Sven Strick
r
oth
Better indicate whi
c
h is the base revisio
n
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-25
S
v
e
n
Stri
c
kr
o
th
Revert commit acc4e754731fdab8
2
753e
d
f9fd3776
8
86
4
43b840
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-25
Sv
e
n
Strickroth
Fix possibl
e
c
rash
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-25
Sven Stric
k
roth
F
i
x ass
e
rti
o
n
e
rror
in li
b
git
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-25
S
v
en
S
trickr
o
th
Don't enable Edit
.
tgitconf
i
g if w
e
do
n
'
t
have a repo
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-25
Sven S
t
rick
r
oth
Fix warn
i
ngs
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-25
Sven S
t
ri
c
k
r
oth
Use Appe
n
dForma
t
and pr
e
v
e
n
t usage
o
f
tempo
r
ary strings
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-25
Sven Strickroth
Drop
c
o
de
w
/
o
f
u
nction
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-25
Sven Stri
c
kr
o
th
Prevent the creation of
intermediate
obje
c
t
s
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-25
Sven Strickroth
Use random boundary in mails
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-25
Sven Stric
k
roth
C
o
rrectly encode mail subject
a
n
d
sender name
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-25
Sven
S
trickroth
Use
.
empt
y
() instead of
size() >= 0
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-25
Sven Strickroth
Do not u
s
e 0 if
we c
a
n use nullptr
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-25
S
ven S
t
rickro
t
h
Pa
s
s FILE_ATT
R
I
BUTE_NORMAL to CreateFile
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-25
S
v
en Stri
c
kro
t
h
D
r
op
u
nneeded braces and em
p
ty lines before o
r
after
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-25
Sven Str
i
ckr
o
th
U
s
e
.
Empty() on CString instead of se
t
ting
it to L""
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-25
Sven Strick
r
oth
D
r
o
p
unu
s
ed cod
e
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-25
Sven
Strickr
o
th
Upd
a
t
e
libgit2
to version 0
.
24
.
0
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-25
Sven Stri
c
k
roth
M
e
rge b
r
a
n
ch 'sci
n
t
illa-36
4
' into tgit-21
commit
|
commitdiff
|
tree
2016-03-25
Sv
e
n Strickroth
Applied backgroundcolors
.
patch
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-25
Sven Strickroth
Update sci
n
t
i
l
la t
o
version 3
.
6
.
4
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-25
Sven St
r
ickroth
Fi
x
warnings
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-25
Sv
e
n Strickrot
h
I
mprove
s
u
p
p
ort
f
o
r ProgramData config
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-25
Sven S
t
rick
r
oth
Also su
p
port nested q
u
ote
s
a
n
d quoted mail addresses
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-25
Sv
e
n Strickroth
Dedu
p
l
i
ca
t
e code
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-25
Sven Strickroth
Corr
e
ctly
s
end mail
w
h
i
ch contain
a singl
e
dot on a
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-23
Sv
e
n Strickroth
Fi
x
ed issue #2715:
C
annot com
m
it with a
commit
m
essag
e
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-23
S
v
en Strickro
t
h
Fixed
i
ssue #2728: Cherry Pick is not wor
k
in
g
in
case
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-23
Yue Lin Ho
Fixe
d
issue #2740: Order of compared references in
.
.
.
commit
|
commitdiff
|
tree
2016-03-23
Sven
Strickroth
When savin
g
the file, a
l
low access to
t
he file wh
i
le
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-23
Sv
e
n
S
t
r
i
ckro
t
h
Deduplicate code
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
next