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
Fixed iss
u
e #2785: Rebase/C
h
er
r
y-pick with conflict
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-06-19
Sven Strickroth
Make more
c
l
ear not to e
n
able a
n
y hack for
t
he Git
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-06-19
Sven
Strickroth
M
e
rge branch
'
rename-abbreviation'
commit
|
commitdiff
|
tree
2016-06-19
Sven St
r
ickroth
Fixed issue #2773
:
D
irectory r
e
n
ame sh
o
uld
b
e displayed
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-06-19
Sven Strickroth
Add tests
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-06-19
Sven Strickroth
Moved
rename abbr
e
viation code to CTGitPat
h
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-06-18
Sv
e
n Strickroth
FileDiffDlg:
F
ix bl
a
me of ad
d
ed/deleted/renamed file
s
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-06-18
Sven Strickroth
Pulle
d
di
f
f a
n
d log o
p
tio
n
s
m
i
xed u
p
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-06-18
Sven Stric
k
rot
h
Dro
p
u
nneeded reference
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-06-18
Sven
S
trick
r
ot
h
FileDi
f
fDlg: Switch V
e
rsi
o
n 1 and
Version 2
(
Base)
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-06-13
Sven Strickroth
Fixed issue
#2
7
83: "Del
e
t
e
and a
d
d to ignore list"
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-06-06
Sven Strickroth
Fixe
d
i
s
sue #2774:
Pull d
i
al
o
g with Russian LangPa
c
k
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-31
Sven Strickroth
Update libg
i
t to 2
.
8
.
3
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-23
S
ven S
t
r
i
ckroth
Re-r
e
gister sys
t
ray icon after explorer
.
e
xe restart
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-17
Sven S
t
r
ickroth
M
erge branch
'
moda
l
ity'
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-17
Sven Strick
r
oth
F
ix modality of message boxes
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-17
Sup Yut
S
um
F
ix CMess
a
geBo
x
wit
h
default te
x
t not moda
l
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-17
Sup Yut Sum
Fix CMe
s
s
ageBox
n
o
t
m
odal
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-14
Sve
n
St
r
ickroth
Add bord
e
r
-
s
ize
d
padding for tree view items in R
e
posi
t
ory
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-14
Sven Strickr
o
th
Create shel
l
t
r
ay icon after we star
t
e
d CommandWai
t
T
h
read
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-12
Sven
Strickroth
Make sure the st
r
ing
i
s
n
o
t used as a format
string
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-11
Sven Strickroth
Update
libgit2
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-08
S
v
e
n
Strickroth
Update libgit to 2
.
8
.
2
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-07
Sven Strickrot
h
Dro
p
checks for unsupported
git versions
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-07
Sven
S
trickr
o
t
h
Increase
t
im
e
out
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-07
Sve
n
Stric
k
r
o
th
Fixed
issue #2772: Comparing w
i
th adde
d
file migh
t
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-06
Sven
S
trickroth
Fix some
l
inks
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-05
S
v
en Stric
k
ro
t
h
Update git documentation
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-05
S
ven Str
i
ckroth
Merge branch 'scintilla-365
'
commit
|
commitdiff
|
tree
2016-05-05
Sven Stric
k
roth
A
p
pl
i
e
d
background
c
olors
.
p
a
t
c
h
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-05
Sven
S
trickroth
Update Scintilla to version 3
.
6
.
5
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-05
Sven Strickroth
A
dd
L
ruCache for sp
e
ll check
e
r
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-05-05
Sven Strickroth
Perform stylin
g
and spell checki
n
g
i
n SCN_STYL
E
NEE
D
ED
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-04-30
Rick B
u
rgstaler
Tests: Fix dependency on user setti
n
g
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-04-22
Sven Strickroth
Revert commit acc4e754731fdab82753edf9fd3776886443b840
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-04-22
Sven Strick
r
oth
I
m
prove read
a
bility of version
strin
g
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-04-22
Sven Str
i
ckroth
I
n
clude load
e
d lan
g
uage pack into cras
h
report
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-04-22
Sve
n
St
r
ickr
o
th
P
o
rt s
o
m
e
fixes from Git for Windows
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-04-22
Sven St
r
ic
k
roth
get_windows
_
h
ome_d
i
rectory might point to wrong buffer
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-04-20
S
ven Strickroth
Use Task
D
ialog i
f
possible
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-04-20
Sven Strick
r
oth
Use default MessageBox
i
f
we don't use speci
a
l button
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-04-15
Sven
S
tri
c
kroth
Ve
r
tically center t
e
xt if icon is shown
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-04-15
Sven Strickro
t
h
F
ix
p
ositio
n
ing of
i
con in CMessageBox
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-04-15
Sven Strickrot
h
Replace auto_p
t
r with uniqu
e
_ptr
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-04-15
Sven
Strickr
o
th
F
i
xe
d
iss
u
e #2759:
Swa
p
ped THEI
R
S
a
nd MI
N
E in
c
h
e
rry
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-04-05
Sven S
t
rickroth
Up
d
ate libgit to
v
ersion 2
.
8
.
0
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-04-01
Sven Strickrot
h
Sync wi
t
h To
r
t
o
iseSVN
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-31
Sven S
t
rickroth
Vari
a
ble
must be volat
i
le as it's
used in multipl
e
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-31
S
v
e
n Stri
c
kroth
Sm
a
ll performance improv
e
ment
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-29
Sven
Str
i
ckroth
A
dd Persian lan
g
uage
p
ack
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-29
S
ven S
t
rickro
t
h
Fix
c
lon
i
n
g an empty CEnvironment
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-28
Sven Stri
c
k
r
oth
Get rid of std
s
tring and w
i
d
e
_stri
n
g
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-28
Sv
e
n Strick
r
o
t
h
libgit 2
.
7
.
4
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-28
Sven
S
tric
k
roth
Sepa
r
ate
l
i
b
git e
n
vironment from the outer p
r
oces
s
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-28
S
v
en Strickro
t
h
A
d
d
t
est
a
gainst issue
#2225
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-28
S
v
en S
t
rickroth
Don't
f
a
il test ba
s
e
d
o
n user setting
s
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-27
Sven Stri
c
kro
t
h
A
d
d virtual de
s
tructors
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-27
Sven Strick
r
oth
Un
i
code
p
r
ocesses must a
l
ways pass CREATE_UNICODE_E
N
VIR
O
NM
E
N
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-27
Sven Strickroth
Add
C
reateP
r
o
c
essHe
l
per to projects wher
e
necessary
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-27
Sven
Stri
c
kroth
Use a fixed pointer p
o
inti
n
g t
o
the cur
r
ent ver
s
ion
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-27
Sven Str
i
ckroth
Me
r
ge bran
c
h 'tgit-22'
commit
|
commitdiff
|
tree
2016-03-26
Sven
S
t
rickroth
Fix p
o
ssibl
e
c
rash
i
f git
c
onfig is br
o
ken
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-26
Sve
n
Strickroth
Merge branch 'tgit-2
.
1'
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-26
Sven Strickroth
Prepare release and
b
u
mp version num
b
ers
to 2
.
1
.
0
.
0
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-26
Sve
n
St
r
ic
k
rot
h
Sync transla
t
io
n
s with
Transifex
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-26
S
v
en Strickrot
h
Update spell checker dictionaries
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-26
Sven Strick
r
oth
Upd
a
t
e lib
g
it to 2
.
5
.
5
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sven St
r
i
c
kroth
Add
n
ote t
o
autolist
.
txt
a
nd improve n
o
te in snipp
e
t
.
txt
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sven Str
i
c
kr
o
t
h
Autolist
parser
:
I
g
n
o
re e
m
pt
y
li
n
es and skip co
m
ments
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sven
S
t
rickroth
Better indi
c
ate which
i
s
t
he b
a
s
e revision
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sven
Str
i
ckroth
Revert
co
m
mit acc4e754731
f
dab82753ed
f
9fd3
7
76886443b840
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sven
Strickroth
Fix
p
o
s
sible crash
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sve
n
Str
i
ckro
t
h
Fix asse
r
tion erro
r
in l
i
bgit
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sven
Stri
c
kroth
D
o
n't enable Edi
t
.
tgitconf
i
g if we don't h
a
ve a repo
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sv
e
n Strickroth
Fix warn
i
ngs
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sven Stric
k
rot
h
Use A
p
pend
F
ormat and prevent
usag
e
of temporary strings
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
S
v
en St
r
ickr
o
th
Drop
code w/o fun
c
t
i
on
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sve
n
Strickr
o
th
Pr
e
vent
t
h
e
creation of
i
n
termediate
objects
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sve
n
Stri
c
kroth
U
se random boundary i
n
mails
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
S
v
en
S
trickro
t
h
Correctly encode mail subj
e
c
t
a
nd
s
e
nder name
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
S
v
en Strickro
t
h
U
s
e
.
empty() instead of size() >= 0
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sven Strickrot
h
Do not use
0
if we can use nu
l
lptr
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sven Strickro
t
h
Pass FIL
E
_AT
T
R
IBUTE
_
N
ORMAL to CreateFil
e
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sv
e
n Stri
c
kro
t
h
Drop unneeded braces and emp
t
y lines before or
after
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sve
n
Strickroth
Use
.
Empty() on CString
i
nstead of setting i
t
to L""
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sven Strickroth
D
r
o
p unused code
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sve
n
Strickroth
Update libgit2 to version 0
.
24
.
0
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sve
n
Strickroth
Mer
g
e
branch
'scintilla-364'
i
nt
o
tgit-21
commit
|
commitdiff
|
tree
2016-03-25
S
ven Stric
k
roth
Applied b
a
c
kground
c
olors
.
p
atch
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sven S
t
rick
r
oth
Update scintilla to version 3
.
6
.
4
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sven Str
i
ckroth
Fix warnin
g
s
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sven Strickr
o
t
h
Improve
s
uppor
t
for ProgramD
a
ta co
n
fig
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sven Strickroth
Also sup
p
ort nested
q
uotes and q
u
o
t
ed m
a
il addresse
s
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sven St
r
ickroth
Dedupl
i
ca
t
e
code
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-25
Sven Strickroth
C
o
rrectly
sen
d
mail
which contain a single
d
ot on a
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-23
Sve
n
Str
i
ckroth
Fixed
i
ssue
#2715: Cannot commi
t
with a commi
t
m
essage
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-23
Sven Strickroth
Fixed is
s
ue #2
7
2
8
: Cher
r
y Pick is not
w
o
r
king in case
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-23
Yue Lin Ho
F
i
xed issue #2740: Order of compared ref
e
ren
c
es in
.
.
.
commit
|
commitdiff
|
tree
2016-03-23
Sven S
t
rickroth
When sav
i
ng the file, allow acce
s
s to the fi
l
e while
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-03-23
Sven Strickro
t
h
Deduplicate code
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
next