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
Sv
e
n Strickroth
Fixe
d
issu
e
#2785: Rebas
e
/C
h
erry-
p
ick with conf
l
ict
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-06-19
Sve
n
Strickroth
Make mor
e
clear not to
e
nable any hack
for the Git
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-06-19
S
v
en Strickrot
h
Merge branch 'rena
m
e-
a
b
brevia
t
ion'
commit
|
commitdiff
|
tree
2016-06-19
Sven Strickroth
Fixed
issue #27
7
3
:
Directory rename
should be displayed
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-06-19
Sven Strickroth
Add te
s
ts
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-06-19
Sven Str
i
ckroth
Moved rename a
b
breviation code to CT
G
itPa
t
h
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-06-18
S
v
en
S
t
rickroth
FileDiffDlg: Fix blame of added/delete
d
/renamed
f
i
l
es
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-06-18
Sven Strickrot
h
Pulled diff a
n
d log options m
i
xed up
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-06-18
S
v
e
n
Stri
c
kroth
Drop
u
nneeded
r
eference
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-06-18
Sven
S
t
rickroth
FileDiffDlg: Sw
i
tch Version 1
a
nd Versio
n
2
(Base)
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-06-13
S
v
en Strickr
o
th
Fixed is
s
ue
#2783: "Delete an
d
ad
d
to
i
gnore
list"
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-06-06
Sve
n
Strickrot
h
Fixed issue
#2
7
7
4: Pull dialog with Russian LangPack
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-31
S
v
en Strickrot
h
Upd
a
te libgit
to 2
.
8
.
3
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-23
Sven Strickr
o
t
h
Re-reg
i
s
ter sys
t
ray ico
n
a
f
ter explorer
.
exe
r
estart
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-17
Sven Strickroth
Me
r
g
e
branch 'm
o
dality'
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-17
Sven Strickrot
h
Fix modality of
message bo
x
es
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-14
Sven Strickr
o
th
Add border-sized
p
a
d
ding for
tree
view items
i
n Re
p
ository
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-14
Sven Strickroth
Cre
a
te
sh
e
ll tray ico
n
afte
r
we st
a
rted CommandWaitT
h
read
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-12
S
ven Stric
k
r
oth
Ma
k
e sure the strin
g
is not us
e
d as a for
m
a
t string
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-11
Sven
Stric
k
roth
Update
l
ibgit2
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-08
Sven
Strickroth
U
p
d
ate libgit
to 2
.
8
.
2
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-07
Sven Strickroth
D
r
op checks for unsu
p
ported
git
versions
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-07
Sven Stric
k
roth
Increase timeout
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-07
Sven Strickr
o
th
F
i
xed i
s
su
e
#2772: Comparin
g
with added file mi
g
ht
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-06
Sven Strickroth
Fix some
l
i
n
ks
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-05
Sven
S
trick
r
oth
Up
d
ate
g
it docume
n
t
a
tion
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-05
Sven Stric
k
ro
t
h
Merg
e
branch 's
c
intilla-
3
65
'
commit
|
commitdiff
|
tree
2016-05-05
Sven
Str
i
ck
r
oth
Applied
b
ackgroundcolors
.
patch
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-05
Sven Str
i
c
k
roth
Upda
t
e Scintilla to version 3
.
6
.
5
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-05
S
ven Str
i
c
kroth
Add LruCache for spel
l
checker
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-05
Sven S
t
r
i
ckroth
Perform
s
tyling
a
nd spell che
c
king in SCN_STYL
E
NEEDED
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-04-22
Sven Stric
k
roth
R
evert commit
ac
c
4e754731fdab82753edf9fd377688644
3
b840
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-04-22
Sven
Strickr
o
th
Improve re
a
dability
of
version string
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-04-22
Sven Strickroth
Include loaded language pack into cras
h
repo
r
t
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-04-22
Sven S
t
rickroth
Por
t
s
o
m
e
fixes fr
o
m
Git for
W
i
ndows
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-04-22
S
v
en Strickroth
get_windows_ho
m
e_director
y
m
ight
point to
w
rong buffer
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-04-20
S
ven Strickroth
U
se Task
D
i
a
l
og
i
f p
o
s
si
b
le
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-04-20
Sven Strickroth
Use defa
u
lt
MessageBox
i
f
we don't u
s
e specia
l
button
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-04-19
S
ven Strickroth
Drop HTML from messages
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-04-15
S
v
en Strickroth
Vertically cen
t
er text if i
c
on is shown
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-04-15
Sve
n
Strick
r
o
t
h
Fi
x
positioning of
icon in CMessageBox
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-04-15
Sven Str
i
ckroth
Replace auto_ptr with unique_ptr
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-04-15
Sven
Strickrot
h
Fixed
iss
u
e #2759: Swapped THEIRS and MINE in cherry
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-04-05
Sven Strickroth
U
pdate
libgit to
v
ersi
o
n 2
.
8
.
0
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-04-01
Sven Strickroth
Sync with
T
o
rtoiseSVN
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-31
Sven
S
t
rickroth
V
a
riabl
e
m
ust be
v
o
l
atile as it's used
in
m
ultiple
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-31
Sven S
t
rickroth
Smal
l
perfor
m
ance im
p
rovemen
t
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-29
Sve
n
Strickro
t
h
Add Persian language pack
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-29
Sven
Strickr
o
th
Fix cloni
n
g an em
p
ty CEn
v
ir
o
nment
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-28
Sven Strick
r
ot
h
Get
r
id o
f
st
d
string and
w
id
e
_string
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-28
S
ve
n
S
trick
r
oth
li
b
git 2
.
7
.
4
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-28
Sven Strickr
o
th
S
e
p
a
rate libgit environment from
the ou
t
er process
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-28
Sven Strickroth
Add test against
i
ssue #2225
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-28
S
ven Strickr
o
t
h
D
o
n't fa
i
l test based on u
s
er
s
etting
s
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-27
S
v
en
S
t
ric
k
roth
Add vir
t
ual destruct
o
rs
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-27
Sve
n
Strickroth
Unicode pr
o
cesses must always pass
C
REATE_UNICODE_ENVIRONMEN
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-27
Sven Strickroth
A
dd CreateProcessHe
l
per to proje
c
ts where necessary
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-27
Sv
e
n Strickro
t
h
Use a fixed pointe
r
pointing to the current version
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-27
S
ven Stric
k
roth
Merge bran
c
h 'tgit
-
22'
commit
|
commitdiff
|
tree
2016-03-26
Sven
St
r
i
c
k
r
oth
Fix possible cras
h
if gi
t
c
o
n
f
i
g
is broken
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-26
Sven
Stri
c
krot
h
Merge branch 'tgit-
2
.
1'
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-26
S
v
e
n
Str
i
ck
r
oth
Prepare release a
n
d bump vers
i
on numbers to 2
.
1
.
0
.
0
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-26
Sven Strickroth
Sync tr
a
nslat
i
ons with Transifex
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-26
Sven Strickroth
Update spel
l
checker dictionaries
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-26
Sven S
t
r
i
ckrot
h
Update libgit to 2
.
5
.
5
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
S
ven
Strickroth
Add note to
au
t
olist
.
txt a
n
d improve
n
ote i
n
snippet
.
txt
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
S
ve
n
Strickro
t
h
Autolist parser: Ign
o
re empty
l
i
nes and ski
p
co
m
ments
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sven S
t
r
ickroth
Bett
e
r
indicate which is t
h
e base re
v
ision
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sven Stri
c
k
roth
Revert commit a
c
c4e754731fdab82753edf
9
fd3776886443b840
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
S
ven Strickrot
h
F
ix possible cras
h
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sv
e
n Strickroth
Fix asser
t
i
o
n
e
rr
o
r in libgi
t
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sven
S
trickroth
Do
n
't e
n
ab
l
e Edit
.
tgitconfig
if
w
e
don't
have a repo
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sven S
t
rickroth
Fix warnin
g
s
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
S
ven Strickr
o
th
Use
A
ppendFormat and prevent usa
g
e of temporary s
t
rings
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
S
v
en Strick
r
oth
D
r
op code w/
o
fu
n
ction
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sven
Strickr
o
th
Pre
v
ent the cre
a
tion
o
f inte
r
mediate ob
j
ect
s
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sve
n
Stric
k
roth
Use rando
m
bound
a
ry in
m
a
i
ls
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sv
e
n S
t
r
ickroth
C
o
rrect
l
y
encode ma
i
l subject and sender nam
e
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sven Strickroth
Use
.
empty() instead of size() >= 0
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sven Strickrot
h
D
o
not use 0 if we can use
n
ullptr
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sven S
t
rickroth
Pass FILE_ATTRIBUTE
_
NORMAL
to CreateFile
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
S
v
en S
t
ri
c
kroth
Drop unne
e
ded braces
a
nd em
p
t
y
lines before or after
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sv
e
n
Strickroth
Use
.
Empty() on CString instead
of setting it to L""
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sven Stri
c
kroth
Drop unused code
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sven Strickroth
U
pd
a
te libgit2 to versi
o
n
0
.
2
4
.
0
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
S
ven
S
t
ri
c
kroth
Merge bra
n
c
h 'scintilla-364' into tg
i
t-21
commit
|
commitdiff
|
tree
2016-03-25
Sven Strickro
t
h
A
p
plied backgroundcolors
.
patch
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sve
n
St
r
ickroth
Upda
t
e scintilla
t
o
versi
o
n 3
.
6
.
4
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sven Stri
c
kroth
Fix
w
a
rnings
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sven Strick
r
o
th
Imp
r
o
ve support for
P
rogra
m
Data c
o
nfig
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sven Strickroth
Also support nested
q
u
o
tes and quoted
m
a
il addr
e
sses
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sven Strick
r
oth
Deduplicate c
o
de
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sv
e
n Strickroth
Correctly send mail which con
t
a
i
n
a single dot
o
n
a
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-23
Sven Stric
k
rot
h
Fixed issue #2715
:
Cannot
c
ommit wi
t
h a commi
t
message
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-23
Sven Stri
c
k
roth
Fixed
issue #
2
728:
Ch
e
rr
y
Pick
i
s n
o
t working in case
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-23
Sven Strickroth
Wh
e
n
saving the
f
ile,
allow a
c
c
ess to the file wh
i
le
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-23
Sven
Strickr
o
th
De
d
uplicate code
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-23
Sve
n
Strickroth
D
e
d
uplicate
code
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-23
S
v
e
n
S
t
r
ickroth
Cr
e
dentia
l
hel
p
er ch
o
oser did
n
ot work a
n
y more
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-23
Sven
S
tr
i
ckro
t
h
Fixed issue
#
27
3
1: Improved au
t
olist
.
txt regex for
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
next