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
Improve conflict resolving
2017-07-08
S
v
en
Str
i
ckroth
Impr
o
ve conflict r
e
solvin
g
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-07-08
Sven
Stric
k
roth
FileDiffDlg: Allow to use alternat
i
v
e
diff to
o
l by
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-07-08
Sve
n
Str
i
c
k
r
o
t
h
Allow t
o
vi
e
w d
i
ff on
Delete/Modified conf
l
ic
t
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-07-07
Sven
S
t
rickroth
Fixed
i
ssue
#
2973: Allow to compare
local
a
nd
r
emote
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-07-07
Sven
Strickroth
Don't us
e
"new"
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-07-07
Sven
Strickro
t
h
DeleteCo
n
flictDlg: S
h
ow full pa
t
h in t
i
tle
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-07-07
Sven
Strickroth
Fix
warning C4267
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-07-07
Sven Stri
c
kroth
Fixed
i
ssue #
2
955:
L
o
gDlg:
i
nfinite line to parent
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-07-07
Sven Strickroth
Fixed issue #30
0
8: A
l
low to
p
ush
i
n
dividua
l
tags
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-07-05
Sven
S
trickro
t
h
F
i
xed issue #25
9
9
: C
o
nfusing
ti
t
l
es when resol
v
i
ng
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-07-05
S
v
e
n
St
r
i
ckroth
TG
i
t
M
erge:
D
on't use
t
he
i
r
s
/mine
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-07-05
Sven
S
trickroth
GitStat
u
sLi
s
t: Don't use the
i
rs/mine
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-07-05
Sven Strickroth
P
r
o
v
ide m
o
re in
f
o
r
m
a
tion about br
a
nch being merged
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-07-05
Sven Strickroth
Mi
n
or cl
e
anup
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-07-05
Sven St
r
ickroth
Make stri
n
gs
t
rans
l
a
table
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-07-02
Sven
Strickroth
Dr
o
p
c
o
m
mente
d
c
ode
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-07-02
Sven Strickr
o
th
F
ix numb
e
r of for
m
a
t
p
a
rameters
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-07-02
S
v
en Strickroth
Drop unsu
p
po
r
te
d
UseGi
t
WCRevIgnore
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-07-02
S
v
en S
t
rickr
o
th
Directly
us
e
f
ormat
s
tring
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-07-02
S
ven Str
i
ckroth
Don't u
s
e magic numb
e
rs
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-07-02
Sven
S
trickroth
Drop unused variable and fix return value
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-07-02
Sven Stric
k
roth
Correct
l
y clo
s
e han
d
les
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-07-02
S
v
e
n
Stric
k
roth
Fix FormatMessage v
s
.
Format
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-07-02
S
v
e
n
Strickroth
Fix sig
n
ed/unsigned m
i
smatch warnin
g
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-07-02
Sv
e
n Str
i
ckr
o
th
Drop unused
s
t
ring
s
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-07-02
Sven St
r
ic
k
r
o
th
Update Tortois
e
.
p
o
t wit
h
even
more resolved IDs
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-07-02
Sven Strick
r
oth
A
l
so handle resolvi
n
g of IDs st
a
r
ting with AFX_ and
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-07-02
Sven Strickroth
Don't bail out for symb
o
lic remote
r
eferenc
e
s
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-07-02
Sven Strickroth
Sync sm
a
r
t
ta
b
d
e
te
c
tion
code wi
t
h Tort
o
iseSVN
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-07-02
Sven Strickroth
Ask before push
i
n
g
a
ll local branches to a rem
o
t
e
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-07-02
Sv
e
n Strickroth
TGitBlam
e
: Rememb
e
r las
t
search string
d
i
r
e
c
t
ly at
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-07-02
Sve
n
S
trickroth
Cons
i
stently flash find dialog window whe
n
search wraps
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-07-02
Sven Strickro
t
h
TG
i
tBlame: All
o
w to se
a
rch both dir
e
ctions
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-07-02
Sven S
t
rickroth
Fix faili
n
g AppVeyor t
e
sts
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-07-02
Sven Stri
c
kroth
Up
d
a
te Tort
o
ise
.
p
o
t
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-07-02
Sven St
r
ickrot
h
Remo
v
e all
s
ignature
s
from to-be-t
r
anslat
e
d f
i
les and
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-07-02
S
v
en Strickroth
Cle
a
n up expa
t
p
r
oj
e
ct pro
p
erties
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-07-02
Sven S
t
rickroth
Fi
x
case sensitive searchin
g
a
n
d use m_p
F
indDialog
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-07-01
Sven Strickr
o
th
Fixed issue
#
2
5
50: Search fu
n
c
tional
i
t
y
o
n
message
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-07-01
Sve
n
S
t
r
i
ckr
o
th
Drop
unneede
d
declarat
i
o
ns
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-07-01
Sv
e
n Strickroth
Fixed issue #2448: Tort
o
iseGitBlam
e
: L
i
n
e
Wrapping
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-07-01
Sven Strickro
t
h
F
ixed iss
u
e #2429: "Abort me
r
g
e
"
should
allow to select
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-07-01
Sven
S
tr
i
ckroth
T
G
itBla
m
e:
I
mplement doubl
e
buffering
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-07-01
Sven
S
trickrot
h
Au
t
o
ma
t
ically ex
t
ra
c
t
remote branch for
fetc
h
and pull
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-07-01
Sv
e
n Str
i
ckroth
Make
lock unconditional
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-07-01
Sven Strickroth
Merge branch 'statdlg'
commit
|
commitdiff
|
tree
2017-07-01
Sven
S
t
r
ickroth
Allow to use committer nam
e
s
or author dates
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-07-01
Sven Strickro
t
h
Adj
u
st checkbox
l
engths
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-07-01
S
v
en St
r
ickroth
U
se
preset def
a
ults
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-07-01
Sven St
r
ick
r
oth
Call G
a
therDat
a
after w
e
loaded th
e
c
o
n
ditions w
e
want
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-07-01
S
v
e
n Strickroth
StatsGraph: Make
a local copy of re
v
list
s
o that w
e
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-07-01
Sven Strickroth
N
o
need to refr
e
sh log af
t
e
r
opening statistics
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-07-01
Sven
Stric
k
roth
Update a
p
r
and
a
pr-util
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-06-30
Sven St
r
ickroth
Blame: Call g
i
t_init as early as possible i
n
order
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-06-30
Sve
n
S
t
rickroth
Commi
t
Dlg: Preve
n
t
p
os
s
ible dea
d
lock
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-06-30
Sven Strickroth
Red
u
ce c
o
pying
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-06-30
Sven Strickr
o
th
Access
m_HashMap w/o
m
odifying i
t
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-06-30
Sven Str
i
ckrot
h
Che
c
k
that l
i
st is not empty
b
efore
a
cce
s
sing it
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-06-30
Sven Str
i
ckroth
AddDlg
:
Might sh
o
w wrong fi
l
es (
i
.
e
.
, mo
d
ified ones
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-06-30
Sven
S
trickroth
Print err
o
r messag
e
if there is no g
i
t log handle
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-06-30
Sven
Strickroth
Don't try to s
t
ore
creden
t
ial setting
s
if advan
c
ed
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-06-30
Sven S
t
r
i
c
kroth
C
onsistently
u
se
G
e
tHe
a
derCtrl() instead of non
-
documented
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-06-30
Sven
S
trickr
o
t
h
Allow to ope
n
commit d
i
alog a
f
ter m
e
r
ge with
c
o
nflicts
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-06-30
S
v
en Strickr
o
th
Fixe
d
i
s
sue #3014
:
M
e
r
g
eDlg: Commit dialog is opened
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-06-30
Sven Strickroth
Fix
p
ossible
c
ras
h
i
f
"git
.
exe diff-index
"
exits
w
ith
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-06-30
Sven
S
tri
c
k
roth
Inc
l
ude status whether Cygwin or Msys2 h
a
cks ar
e
e
nab
l
ed
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-06-30
S
v
e
n S
t
rickroth
Don
'
t try to
c
hange the c
u
rsor to an
arrow
on th
e
inf
o
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-06-30
Sven Stri
c
kroth
Use
v
ector
.
d
a
t
a() instead of
&vector[0]
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-06-30
Sven Stric
k
roth
Use nul
l
ptr inst
e
ad of 0
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-06-29
Sven Str
i
ckroth
N
o need for an additiona
l
nullptr ch
e
ck
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-06-28
Sv
e
n Str
i
ckroth
F
ix
e
d is
s
ue #30
1
3
:
Error me
s
sage if remote Git outp
u
t
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-06-28
Sven Stric
k
ro
t
h
SyncDlg
:
Fix re
d
r
a
w
bug and
f
lickering
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-06-28
Sven S
t
ric
k
roth
LogDlg: Show file s
t
atistic
s
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-06-28
Sven Strickroth
Add mor
e
pessimi
s
tic nullptr
c
hecks
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-06-27
Sve
n
Stri
c
kroth
GitStatusList: Dro
p
alterna
t
ive Show method
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-06-27
S
ven Strickrot
h
Don't shutdo
w
n GDI if not in
i
tialized
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-06-27
Sven St
r
ickroth
SyncDl
g
:
D
o
not
t
ry t
o
update
view if user wants to
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-06-27
Sven Str
i
ckroth
Set empty message before it might
b
e shown
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-06-27
Sv
e
n Strickroth
Fix setting auto width of col
u
mns
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-06-26
Sve
n
Strickroth
Drop unused member variable
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-06-25
Sven
S
t
r
i
c
k
roth
Use higher
resolution tim
e
stamp
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-06-25
Sven
St
r
i
c
k
roth
Drop unused
m_Tre
e
Hash
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-06-25
Sven Str
i
c
k
r
oth
TGitCache
:
A
lso consider file size
for checkin
g
freshness
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-06-25
Sven Strickroth
Replace deprecated functional obj
e
cts
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-06-25
Sven Strick
r
oth
Correc
t
ly
s
et CC recipien
t
s
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-06-25
S
v
en
Strickroth
Fixe
d
iss
u
e #3005: Tort
o
iseGit does not support c
l
oning
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-06-25
S
ven S
t
rickroth
G
itSta
t
usLis
t
: E
x
tend copy op
t
i
on
s
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-06-25
Sven
Strickroth
GitStatusL
i
st: Centralize
Ge
t
C
e
l
lText
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-06-25
Sven S
t
r
ickroth
GitSta
t
us
L
i
stCtrl: Better locking
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-06-24
Sv
e
n
S
trickroth
Constify CTG
i
tPath::GetAbbreviatedRename()
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-06-24
Sven
Strickroth
GitStatu
s
Lis
t
Ctrl: Use log
i
cal
sort if enabled (a
s
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-06-24
Sv
e
n
Stric
k
roth
CGitStatusListCtr
l
: Use stable sort
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-06-24
Sven Strickroth
Drop un
i
mpl
e
mented
met
h
ods
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-06-24
Sv
e
n Str
i
ckroth
Hon
o
r rule of five
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-06-20
Sv
e
n Strickroth
Drop declared but not defined me
t
hods
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-06-20
Sv
e
n
S
t
rickroth
Call GetSel
e
c
tedCount() just once
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-06-19
S
v
en Strick
r
oth
Also
u
se normalized paths
for
t
he
index and HEAD tree
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-06-19
S
v
en Strickr
o
th
Dro
p
unused
method
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-06-18
S
ven Strickr
o
th
Use GetTi
c
kCount64 i
n
stead of G
e
tCurrentTime
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2017-06-18
Sven
Strickroth
A
d
d NULL c
h
ecks
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
next