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
F
ixed
issue #27
8
5: Rebase/Cherry-
p
ick with conflict
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-06-19
Sven Strickroth
M
a
k
e
more
c
l
e
a
r
no
t
to
enable any hack
for th
e
Git
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-06-19
Sven Stric
k
roth
Merge branc
h
'
rena
m
e-abbreviation
'
commit
|
commitdiff
|
tree
2016-06-19
Sven St
r
ic
k
roth
Fixed issue #2773: Di
r
e
c
tory r
e
name s
h
o
u
ld be displ
a
yed
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-06-19
Sven Strickro
t
h
A
d
d tests
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-06-19
Sven Strickro
t
h
Moved rename
a
bbrevi
a
tion
c
ode to CTGitPath
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-06-18
Sven St
r
ickroth
FileDiffDlg: Fix blame
of added/deleted/renamed
f
ile
s
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-06-18
S
ven
Strickroth
Pulled diff and log op
t
ions mixed up
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-06-18
Sv
e
n S
t
rick
r
ot
h
Drop unnee
d
ed re
f
erence
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-06-18
Sven Strick
r
oth
Fil
e
D
i
ff
D
lg: S
w
itch
V
e
rsion
1
and Ve
r
sion 2
(Ba
s
e)
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-06-13
Sven Strickrot
h
Fix
e
d
is
s
ue #2783:
"Delete and add to
ignore list"
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-06-06
Sven
S
t
rickroth
Fi
x
ed issue #27
7
4: Pull dialog with Russian La
n
g
P
ack
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-05-31
S
ven
S
t
r
ickroth
U
pdate l
i
bgit t
o
2
.
8
.
3
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-05-23
S
ven Strickroth
Re-regist
e
r systray icon after explo
r
er
.
exe r
e
st
a
rt
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-05-17
S
ven Str
i
ckroth
Merge b
r
anch
'
m
odality'
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-05-17
Sven Strickroth
Fix modality of
m
essage
b
oxes
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-05-14
Sve
n
Strickroth
Add border-size
d
pad
d
i
ng for
t
r
e
e
view it
e
ms in Repository
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-05-14
Sven Stric
k
roth
Crea
t
e shell t
r
ay
i
c
on aft
e
r we s
t
ar
t
e
d
CommandWaitThread
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-05-12
Sven Stri
c
k
ro
t
h
Make
s
ure the string is not
u
s
e
d as a format str
i
ng
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-05-11
Sv
e
n
S
trickroth
Upd
a
te libgit
2
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-05-08
Sve
n
Str
i
ckroth
Up
d
ate libgit to 2
.
8
.
2
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-05-07
S
ven St
r
ickroth
Drop checks for
u
n
supported git versions
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-05-07
Sven S
t
rickroth
Increase ti
m
eout
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-05-07
Sven Strickroth
Fix
e
d i
s
sue #
2
772: Comparing
w
i
th ad
d
ed file
m
ight
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-05-06
Sven S
t
rick
r
oth
F
i
x so
m
e links
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-05-05
Sven Stric
k
roth
Update git documentatio
n
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-05-05
Sven Strickrot
h
M
erge branch '
s
c
intilla-36
5
'
commit
|
commitdiff
|
tree
2016-05-05
S
v
e
n Str
i
ckroth
Applie
d
b
a
ckgrou
n
dcolor
s
.
patch
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-05-05
Sven Strickroth
Up
d
ate
Scintilla to ve
r
sion 3
.
6
.
5
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-05-05
S
v
en Strickr
o
t
h
Add LruCache for spell checker
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-05-05
Sv
e
n Strickroth
Perform
s
tyling an
d
spe
l
l chec
k
ing in SCN_STY
L
ENEEDED
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-04-22
Sven S
t
rickroth
Revert comm
i
t acc4e7547
3
1fdab
8
2
753edf9fd3776886443b840
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-04-22
Sven
Strick
r
oth
Improve
re
a
da
b
i
lity of version string
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-04-22
Sven
S
trick
r
oth
Include
l
oaded lang
u
age pack i
n
to crash
report
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-04-22
S
ven St
r
i
c
kroth
Port
s
ome fix
e
s from G
i
t for Wi
n
dows
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-04-22
Sven Strickr
o
th
get_wind
o
ws_ho
m
e_d
i
r
e
ctory m
i
ght
point to wrong buffer
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-04-20
Sven Strickroth
Use T
a
skDialog i
f
poss
i
ble
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-04-20
Sven Strickro
t
h
Use d
e
fault Mess
a
geBox if we don't use sp
e
c
i
a
l button
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-04-19
Sven S
t
rickroth
Drop HT
M
L fro
m
messages
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-04-15
Sven S
t
rickroth
Verticall
y
center te
x
t
i
f icon
i
s shown
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-04-15
Sven Stric
k
r
oth
Fix pos
i
tio
n
ing
o
f icon in CMessageBox
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-04-15
S
ven
Strickroth
Repla
c
e
a
uto_pt
r
with unique_ptr
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-04-15
Sven Strickr
o
th
Fix
e
d issue #
2
759: Swapped TH
E
IRS
a
n
d
MINE in cher
r
y
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-04-05
Sven St
r
ickroth
Update libgit
to versi
o
n 2
.
8
.
0
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-04-01
S
ven Strickroth
Sync
w
it
h
TortoiseSVN
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-31
Sven Strickroth
V
ariable must be volatile as it's u
s
ed in m
u
ltiple
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-31
Sven
S
trickroth
S
m
all
p
erf
o
rm
a
nce im
p
rovem
e
nt
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-29
S
v
en
S
trick
r
o
th
Add Persian
l
angua
g
e pack
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-29
S
ven St
r
i
c
kr
o
th
Fix cloning
an empty CEnvironment
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-28
Sve
n
Strickroth
Get
r
id of stdstring and wide_string
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-28
Sven Strickro
t
h
libgit 2
.
7
.
4
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-28
Sven St
r
i
ckroth
Se
p
a
r
ate l
i
bgit en
v
i
r
onmen
t
from th
e
outer process
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-28
Sve
n
Stri
c
k
r
oth
Add test agains
t
issue #2225
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-28
Sv
e
n Strickroth
Do
n
'
t fail test
b
ased on user settings
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-27
Sven
Str
i
ckroth
Add virtual de
s
tru
c
to
r
s
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-27
Sven Stri
c
k
r
oth
Un
i
code processes mu
s
t alwa
y
s pass CREATE
_
UNICODE_E
N
VIRON
M
E
N
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-27
Sve
n
Strickroth
Add
C
reateProc
e
ssHelper to projects w
h
ere neces
s
ary
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-27
Sven Str
i
ckr
o
th
Use a fixed pointer po
i
nting
t
o
the current version
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-27
S
ven Stri
c
kroth
M
e
rge
b
ranch 'tgit-22'
commit
|
commitdiff
|
tree
2016-03-26
Sven S
t
rick
r
ot
h
Fix possible cra
s
h if git conf
i
g is
brok
e
n
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-26
S
ven Strickroth
Merge branch '
t
git-2
.
1'
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-26
Sven S
t
rickroth
P
r
epare r
e
lease
a
nd
bump ve
r
sio
n
numbe
r
s to 2
.
1
.
0
.
0
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-26
Sven St
r
ickroth
Syn
c
trans
l
ations with Tra
n
sifex
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-26
S
v
en Str
i
ckroth
Upda
t
e
spell
c
heck
e
r dictio
n
aries
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-26
Sven Str
i
ckroth
Upd
a
te libgit to 2
.
5
.
5
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-25
S
ven
Strickroth
A
dd note to autoli
s
t
.
txt and improve note in s
n
ippet
.
txt
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-25
Sven
Strickroth
Aut
o
list pars
e
r: Ignore empty li
n
es and skip c
o
mments
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-25
Sven Strickroth
Be
t
ter indicate which is the b
a
s
e re
v
ision
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-25
Sven Str
i
ck
r
o
th
R
evert commit ac
c
4e754
7
31fd
a
b82753edf
9
fd
3
776
8
86443b840
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-25
Sv
e
n S
t
r
ickroth
Fix
p
ossible c
r
as
h
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-25
Sv
e
n Strickroth
Fix assert
i
on e
r
ror i
n
l
i
bgit
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-25
Sven Strickroth
Don't enable E
d
it
.
tgitconfig if we
don't
h
a
ve
a repo
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-25
Sven
Strickroth
Fix warning
s
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-25
Sven Strickroth
Use A
p
pendFormat and prevent usage of tempora
r
y
st
r
ings
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-25
Sven St
r
ickroth
Drop code w/o function
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-25
Sven
S
trickroth
Prevent the creation of intermediate objects
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-25
Sven
Strickroth
Us
e
random
boundary
in
m
ai
l
s
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-25
Sven
Stric
k
r
oth
Correctly en
c
ode mail subj
e
c
t a
n
d
send
e
r name
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-25
S
ven Strickroth
U
s
e
.
empty() in
s
t
ead of size() >= 0
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-25
Sven Strick
r
oth
Do
n
o
t use 0 if we can use n
u
l
lptr
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-25
Sven
S
t
rickroth
Pass FILE_ATTRIBUTE_NO
R
MAL
t
o CreateFile
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-25
Sven Strickroth
Drop u
n
needed braces and empty
lines before or after
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-25
S
ven Strickroth
Use
.
Empty(
)
on C
S
tring in
s
tead of setting it
t
o
L
""
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-25
Sven Strickroth
Drop unused
c
ode
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-25
Sven
S
trickroth
Update libgit2 to versi
o
n 0
.
24
.
0
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-25
Sven Strickroth
Merge b
r
a
n
ch
'
sci
n
tilla-364' into
t
git-
2
1
commit
|
commitdiff
|
tree
2016-03-25
Sven Strick
r
oth
A
p
plied backgroundcol
o
rs
.
patch
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-25
Sve
n
Strickro
t
h
Upd
a
t
e
scintilla t
o
v
er
s
i
on 3
.
6
.
4
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-25
S
v
en Strickroth
Fix
wa
r
nings
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-25
Sven Str
i
ckroth
Improve support for Progra
m
D
a
ta
c
onfig
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-25
Sven Strickroth
Al
s
o support neste
d
q
u
ote
s
and q
u
oted
mail addresse
s
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-25
Sven Strickroth
D
ed
u
p
l
icate code
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-25
Sve
n
Strickroth
C
o
rrectly send
m
ail which c
o
nta
i
n
a
si
n
g
le dot on a
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-23
Sven S
t
r
ickr
o
th
Fixed issue
#2715: C
a
nn
o
t
com
m
it with a
commit messa
g
e
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-23
Sve
n
Strick
r
oth
Fixed issue
#
272
8
: Cherry Pic
k
is not working in case
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-23
S
ven
S
trickroth
Whe
n
saving
t
he
file, allo
w
acce
s
s
to the file
whi
l
e
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-23
S
v
en Stri
c
kr
o
th
Deduplicate code
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-23
Sven
Str
i
c
kr
o
th
Dedupl
i
cate code
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-23
Sven Strickroth
Cre
d
ential
help
e
r chooser
di
d
not wo
r
k any more
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2016-03-23
Sven Stri
c
kroth
Fix
e
d issue #27
3
1
: Impro
v
ed autolist
.
txt r
e
gex for
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
next