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-02-14
Sven Strickroth
Impr
o
ve
t
ype
s
afety
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-02-13
Sve
n
S
t
ric
k
rot
h
Fixed iss
u
e #1899
:
Suppo
r
t
cherry-p
i
cking merge rev
i
sions
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-02-13
Sv
e
n S
t
rickroth
Fixed iss
u
e #
2
701: Add and Revert shoul
d
respect Auto
c
lose
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-02-09
Sve
n
S
trickroth
RebaseDlg
with preserv
e
merges: Correctly handle conflicts
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-02-09
Sven Strickroth
I
n
i
t
ial
i
ze mem
b
er
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-02-07
Sup Yut Sum
Cleanu
p
index
.
lock after
r
u
nn
i
ng libgit update-
i
ndex
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-02-07
S
v
en Strickroth
Minor code
c
l
eanup
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-02-07
Sven Strickrot
h
Fix
possi
b
le problems with
"
intend to
a
dd" staged files
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-02-07
Sven Stric
k
roth
Wait a
n
d
ter
m
inat
e
backg
r
o
u
nd th
r
ead before destr
u
cting
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-02-07
Sven Strickroth
Some cleanup
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-02-07
Sve
n
S
tri
c
k
r
oth
Prevent shared writes to our c
a
c
h
e f
i
les
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-02-07
Sven S
t
rick
r
oth
Add some
more sanity checks
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-02-06
S
ven
Strickr
o
t
h
Res
e
t rev
i
sion
o
bject in
c
a
s
e of
erro
r
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-02-06
Sven Strickroth
No nee
d
to
reset "new" path
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-02-06
Sven St
r
i
ckroth
U
p
date fi
l
e list when
com
m
it was loaded f
r
o
m
cache
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-02-06
Sven
Strickroth
No
n
eed to
check if a variable
i
s
t
ru
e
we j
u
s
t set
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-02-05
Sven Strickr
o
th
Make
sure m_AsyncThreadExit is initialized
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-02-05
Sv
e
n Stri
c
kroth
Apply same
s
aniti
z
i
n
g r
u
les as git core
do
e
s
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-02-05
Sv
e
n Strick
r
oth
F
ixed
i
ssue #26
9
2:
Add suppo
r
t for pull
.
rebase and
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-02-02
Sven Strickroth
M
a
ke St
r
ipComme
n
tedLines the
d
e
fault
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-01-30
Sven Strickroth
Do regis
t
ry lookup j
u
st once
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-01-30
Sven Str
i
ckroth
Fixed is
s
ue #2655: R
e
s
olve d
o
es
n
ot work on multiple
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-01-28
Sven Str
i
ckroth
Use CFont
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-01-27
Sven
Stri
c
kroth
Convert the CLinkControl to a normal M
F
C control and
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-01-20
Sven Str
i
ckrot
h
M
e
rge
branch 'sc
i
n
t
ill
a
-3
.
6
.
3'
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-01-20
Sven Strickroth
App
l
ied ba
c
kgr
o
undc
o
lors
.
patc
h
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-01-20
Sv
e
n Strickro
t
h
Update Scintilla to 3
.
6
.
3
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-01-12
Sven Strick
r
oth
Ref
a
ctori
n
g: Red
u
ce indenti
o
n
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-01-10
S
v
en St
r
ickroth
Fix poss
i
ble divi
s
i
o
n
by zero
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-01-08
Sven
Strickroth
R
e
factor
:
Use smart pointers
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-01-08
S
ve
n
Strickr
o
th
Init
i
a
l
ize SY
S
_IMA
G
E_LIST after in
i
tializing OLE
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-01-08
Sven Strickrot
h
Fix typo
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-01-07
Sven
Strickroth
RebaseDlg:
Rebasing branched comm
i
ts onto anoth
e
r branch
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-01-06
S
v
en Strickro
t
h
Stick to nam
i
ng conventions
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-01-06
Sven Str
i
ckroth
R
e
fac
t
oring: Re
d
uce in
d
ention
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-01-06
Sven Strickroth
Upd
a
t
e co
p
yrig
h
t
s
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-01-06
Sve
n
Strickroth
Use CComPtr<>
a
nd
r
elated metho
d
s to simplify code
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-01-05
S
v
e
n
S
trickrot
h
Fix
possible race
c
ondition
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2016-01-02
T
i
m Yorke
Fixed is
s
ue
#2629
:
"Bro
w
se References
Dialog"
s
ave
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-31
Sven Stri
c
kro
t
h
C
l
eanup
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-31
Sven Strickroth
Fix w
a
rning
s
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-31
S
ven S
t
r
ickro
t
h
F
i
xed
i
ssue
#
2310
:
A
dd support for no
t
es
.
rewrite
.
rebase
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-30
S
v
en Strickroth
Print
a
w
a
rning on a merge
commit
i
n order to prevent
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-30
Sven Strickr
o
th
A
d
d support
for rebase
.
autostash
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-30
S
ven Strickro
t
h
Fixed iss
u
e #2676:
S
w
apped Theirs
and Mi
n
e in Ed
i
t
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-30
S
v
en St
r
ickroth
Fix resource leak
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-29
Sven Strickroth
Properl
y
cast to ULONGLONG bef
o
re the mul
t
ipl
i
cation
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-29
S
v
e
n Strickr
o
th
Fixed issue
#
2630: TGitB
l
a
m
e: Allow to blame fi
l
es
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-29
Sven Strickroth
Update libgit2
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-29
S
ven
S
tri
c
kr
o
t
h
Add keyboard acce
l
erators
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-29
Sve
n
Strickroth
R
e
factore
d
and
small
f
i
x
u
p
s
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-29
S
ven Strickroth
Resolve poss
i
ble rac
e
conditio
n
s
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-29
S
v
en Strickroth
Mark t
h
e ref counter
as v
o
latile
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-28
Sven Stri
c
kroth
Add help
f
o
r
cherry
p
i
c
k
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-28
Sven
Strick
r
oth
Update
doc f
o
r
p
reserve merge rebase
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-28
Sven S
t
rickr
o
th
RebaseDlg: Use Log font
f
or log tab
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-28
Sven Stri
c
kr
o
t
h
Merge branch 'rebas
e
-preserve-merges'
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-28
Sven Strickroth
Dis
a
ble squash
i
ng of merge co
m
m
i
ts
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-28
Sven Stri
c
k
r
oth
Ad
d
support for "dro
p
ped
c
ommits"
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-28
Sven St
r
ickr
o
th
Reba
s
e
Dlg
:
Support squ
a
shing commits int
o
a merge
commi
t
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-28
Sven Strickroth
Re
b
a
s
eD
l
g:
P
reserving merge commits
basically works
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-28
Sven Strickroth
Trace commits on re
b
ase
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-28
Sven Strickroth
RebaseD
l
g: Exclu
d
e merge commits
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-27
Sven Strick
r
oth
Simpli
f
y
smart handles
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-27
Sven Strickroth
D
o
not use
d
eprec
a
ted GetVersionEx any more
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-27
S
ven Stric
k
r
oth
Extend descriptions
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-27
Sven Strickroth
Fix
e
d issue
#943: Aft
e
r commit, Alt
+
P used to push
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-27
S
ven Strickr
o
th
Drop support for too old g
i
t versions
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-27
Sven S
t
rickr
o
th
Ch
a
nge parameters o
f
pre
a
nd
p
ost push hooks
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-27
Sven
S
t
r
i
c
kroth
Dr
o
p T
G
itCacheC
h
eckContent
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-27
Sven
S
trickro
t
h
Do not check for dictionaries
in too man
y
d
i
re
c
tories
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-27
Sven Stri
c
k
r
oth
Merge branch '
d
rop-xp-support'
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-27
Sven
St
r
ickr
o
th
Update documentation
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-27
S
ven Strickroth
Upda
t
e installer
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-27
S
ven Strickroth
Use SHGetKnownFolde
r
Pa
t
h inst
e
ad of
S
HG
e
tFolderPath
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-27
S
v
en Stric
k
roth
R
eplac
e
GetTickCoun
t
() with GetTic
k
Count64()
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-27
Sv
e
n Stri
c
kroth
D
r
o
p XP compile
r
targe
t
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-27
S
ve
n
Str
i
c
k
r
oth
Re
m
o
ve dynamic linkin
g
using GetProcAddress
(
) for APIs
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-27
S
v
en Strickroth
Drop conditional XP
code
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-27
S
v
en Strickroth
Make use
o
f std:
:
make_u
n
iqu
e
and cha
i
ned as well as
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-27
S
v
e
n Strick
r
o
th
Resolv
e
sma
l
l me
m
or
y
leak
o
n re
f
resh i
n
C
ommi
t
D
l
g and
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-27
Sve
n
Strick
r
oth
Refactor thread management code
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-27
S
v
en Strickro
t
h
Don't
mark the conflict as resolved if the changes
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-27
S
v
e
n
Strickr
o
th
Ref
a
c
t
ored: De
d
uplicate cod
e
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-26
S
v
en Strickr
o
th
Use ModifyStyle(
)
to simpl
i
f
y code
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-24
Sven
S
trickroth
Use SS_BLACK
F
R
AME inst
e
ad
of
SS_OWNERDRAW for splitter
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-24
Yue Lin Ho
Refactore
d
: re-use
C
Git:
:
GetSh
o
rtName()
commit
|
commitdiff
|
tree
2015-12-24
Y
ue Lin Ho
Can't get the fir
s
t local branch when
r
ight
c
lick on
.
.
.
commit
|
commitdiff
|
tree
2015-12-24
Sven Stric
k
roth
TortoiseShell:
U
se InterlockedI
n
crement(
)
/InterlockedDecreme
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-24
Sven
St
r
ickroth
All
o
w
to delete
a
l
l branches at on
c
e
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-24
Sven Strickroth
G
u
ess br
a
nch based on cursor position for sw
i
tch and
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-24
Sven Strickroth
Guess
b
ranch based on cursor position
for
merge, switch
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-24
Sven Strickroth
Allow IsMo
u
seOn
B
ra
n
chLab
e
l to be re-u
s
ed
more widely
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-23
Sve
n
Strickroth
Consti
f
y branch references
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-23
Sven S
t
ri
c
kroth
Ma
k
e sure popupmenu is not
a
nullptr
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-22
Sve
n
Strick
r
oth
Put G
i
tB
l
ameLo
g
List
.
h in
c
o
rrect folder
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-21
Sven Strickroth
U
pdat
e
Tort
o
iseGi
t
P
l
ink to
0
.
66
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-21
Y
u
e
L
in Ho
Fixed
i
ssue #1629:
H
ave the push dialo
g
op
e
ned vi
a
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-21
Yue L
i
n Ho
Log
D
lg: Show
branch descri
p
tion when mou
s
e hov
e
r
s
the
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2015-12-19
Yue
Lin H
o
Refactored
:
re-use
C
Gi
t
::GetShortName(co
n
st CString
.
.
.
commit
|
commitdiff
|
tree
next