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
ven St
r
i
ckro
t
h
Improv
e
confl
i
c
t re
s
olving
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-07-08
Sven Strickroth
FileDiffDlg: All
o
w t
o
use a
l
ternative diff tool by
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-07-08
S
v
en Stric
k
r
o
th
A
llow to
view di
f
f
o
n Delete/Modified
conf
l
ict
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-07-07
Sven
Strickroth
Fixed issu
e
#2973: Allow
to compare local and r
e
m
ote
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-07-07
Sve
n
S
t
ric
k
roth
Don't use "new"
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-07-07
Sven Strickroth
De
l
eteConflictD
l
g: Sh
o
w full
p
ath i
n
t
itl
e
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-07-07
Sv
e
n Strickr
o
th
Fix warning C
4
267
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-07-07
S
v
en Stri
c
k
r
o
th
Fixed issue #2955: LogDlg: i
n
f
i
n
i
te line to parent
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-07-07
Sven St
r
ickroth
Fixed iss
u
e #
3
008: Al
l
o
w
to push individu
a
l tags
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-07-05
Sven Strickroth
Fixed is
s
ue #
2
599: Con
f
u
sin
g
tit
l
es wh
e
n resolv
i
ng
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-07-05
S
v
en Strickroth
TGitMerge: Don't
u
se
th
e
ir
s
/mi
n
e
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-07-05
Sven
S
trickroth
GitStatusList: Don't use the
i
rs/
m
i
n
e
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-07-05
Sven Strickroth
Prov
i
de
m
ore information
a
bout branch being merged
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-07-05
Sven Strickroth
Minor cleanup
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-07-05
Sven Strickroth
Make s
t
ri
n
gs translatable
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-07-02
Sven
Strickroth
Dr
o
p commented code
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-07-02
Sven Str
i
c
kroth
Fix number of format parameters
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-07-02
Sven
Stric
k
roth
Dro
p
u
n
s
upported UseGitWCRevIgnore
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-07-02
Sven Strickroth
Direct
l
y use fo
r
m
a
t
string
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-07-02
Sven Str
i
ckroth
Don't use magic numbe
r
s
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-07-02
Sven Strick
r
ot
h
D
r
op
unu
s
ed variable and
f
i
x return value
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-07-02
Sven Strickroth
C
o
rrectly clos
e
handle
s
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-07-02
Sven Stric
k
roth
Fix FormatMe
s
sage vs
.
F
o
rmat
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-07-02
Sven Strickroth
Fix signed/unsigned
m
i
smatch
warning
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-07-02
Sven Strickroth
Drop unused strings
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-07-02
Sv
e
n Strickro
t
h
Upd
a
te
Tortoise
.
pot with even
mo
r
e resolved ID
s
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-07-02
Sven Str
i
ck
r
oth
A
l
so ha
n
dl
e
r
e
solving
o
f IDs
s
tart
i
ng 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 symbolic re
m
ote references
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-07-02
Sv
e
n Strickroth
Sync smart tab
d
e
t
ection code wi
t
h Torto
i
seSVN
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-07-02
Sven
S
trickroth
Ask before pushing
a
ll
l
o
cal branches to a
r
em
o
te
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-07-02
Sven
S
t
r
ickro
t
h
TGitBl
a
me: R
e
member l
a
st search string directly at
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-07-02
Sven Strickroth
Co
n
s
i
st
e
ntly flas
h
find dialog window when se
a
rch wraps
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-07-02
Sven Stric
k
roth
TG
i
tBl
a
me
:
Allow to search both
d
irecti
o
ns
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-07-02
S
ven Strickroth
Fix
f
ailing AppVey
o
r tests
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-07-02
Sven
S
t
rickroth
U
pdate Tortoi
s
e
.
pot
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-07-02
Sv
e
n Strickroth
Remove
a
l
l signatures from to-be-
t
r
a
n
sl
a
ted files and
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-07-02
Sv
e
n Strickroth
Clean up expat
p
r
oject proper
t
ies
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-07-02
Sven Strickro
t
h
F
i
x c
a
s
e
s
ensitive searching and use m_pFin
d
Dialog
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-07-01
Sven Strickroth
Fixed is
s
ue #2550: Se
a
rch functio
n
ality on
message
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-07-01
Sven
S
t
rickro
t
h
D
rop un
n
e
ed
e
d decla
r
a
t
ions
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-07-01
Sven
Strickroth
Fixed issue #2448:
T
ort
o
iseG
i
tB
l
am
e
:
Line Wrapping
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-07-01
Sven Strickroth
Fix
e
d
i
ssue #2429: "
A
bort mer
g
e
"
sho
u
ld
allow to sele
c
t
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-07-01
Sven Strick
r
oth
T
GitB
l
a
me: I
m
plement do
u
ble buffering
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-07-01
Sven Strickr
o
t
h
A
u
tomatically extract remote branch f
o
r f
e
tch
a
nd pull
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-07-01
S
v
en Strickroth
M
a
ke lo
c
k unconditional
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-07-01
Sven St
r
ickroth
Merge b
r
anc
h
'statdlg'
commit
|
commitdiff
|
tree
2017-07-01
Sv
e
n Strickroth
All
o
w
t
o
use commi
t
t
e
r
names or author dates
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-07-01
S
v
en S
t
rickroth
Adjust checkbox l
e
n
g
ths
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-07-01
Sven S
t
rickroth
Use preset d
e
faults
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-07-01
Sven Strickr
o
th
Call Ga
t
herData after we
l
oaded
the
c
ondi
t
ions we want
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-07-01
Sven
S
trickrot
h
Stats
G
raph
:
Make a local copy of rev
l
ist so that we
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-07-01
Sv
e
n Strickr
o
t
h
No n
e
ed to
refresh log aft
e
r opening statistics
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-07-01
Sven Strickroth
Update apr and a
p
r-ut
i
l
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-06-30
Sv
e
n S
t
r
ickr
o
th
Blame: Call
g
it_in
i
t as early a
s
po
s
sibl
e
i
n
order
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-06-30
Sven Strickroth
CommitD
l
g: Pre
v
ent possible deadlo
c
k
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-06-30
S
v
e
n Strickroth
Reduce copying
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-06-30
Sven Stric
k
roth
Acc
e
s
s m_HashMap w/o modif
y
in
g
it
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-06-30
Sven Stri
c
kroth
Check
that list
i
s
not empty befo
r
e
a
ccessing it
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-06-30
Sven
S
trickroth
AddD
l
g: M
i
ght
s
how wrong
files (i
.
e
.
, modified
o
nes
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-06-30
Sven St
r
ickro
t
h
Prin
t
error message if th
e
r
e is no git
log handl
e
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-06-30
Sven Stric
k
ro
t
h
Don't
t
ry to
s
t
o
re credential se
t
tings if advanced
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-06-30
Sven St
r
ickroth
Consistently use GetHeaderCtrl() instead of non-d
o
cu
m
ented
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-06-30
Sven Strickroth
A
l
l
ow to open commit dialog after m
e
rge with conflicts
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-06-30
Sven
Strickro
t
h
Fixed issue #30
1
4: MergeDl
g
:
Commit d
i
alog is op
e
ned
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-06-30
Sven Strickroth
Fix possible crash if "git
.
exe diff
-
ind
e
x" ex
i
ts with
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-06-30
Sven Strickroth
Include
s
t
atus
whether Cygwin or Msys
2
h
ac
k
s
a
r
e
enabled
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-06-30
Sve
n
S
trickro
t
h
Don't try to chang
e
the cursor to an arrow
on the info
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-06-30
Sven S
t
ri
c
k
rot
h
Use vector
.
data() instead
of
&vecto
r
[0]
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-06-30
Sven
St
r
ic
k
roth
Use nullpt
r
in
s
t
e
ad of 0
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-06-29
S
v
en Strickroth
No
n
eed
f
or an additional nu
l
lp
t
r che
c
k
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-06-28
Sven
St
r
ickr
o
th
Fix
e
d
i
ssue
#
3013: Error mes
s
age
i
f remote Git outpu
t
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-06-28
Sven Strickroth
SyncDl
g
: Fix
redraw bug
a
n
d
f
lickering
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-06-28
Sven
S
trickroth
LogDlg: Show file
s
tati
s
tics
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-06-28
Sven St
r
ickroth
Add more pessimi
s
t
ic nullptr checks
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-06-27
Sven Strickroth
GitSta
t
usL
i
st:
D
ro
p
alte
r
n
ative Show m
e
thod
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-06-27
Sven Strickro
t
h
Don't shutdown GDI if not initializ
e
d
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-06-27
S
ven Stri
c
k
r
ot
h
SyncDlg
:
D
o not try to up
d
at
e
view if user wa
n
ts to
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-06-27
Sven St
r
ic
k
ro
t
h
Set em
p
t
y
mes
s
age before
i
t
m
ight be shown
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-06-27
Sve
n
Strickro
t
h
F
ix set
t
ing
auto wid
t
h of columns
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-06-26
Sven Strickroth
Dro
p
unused m
e
mber va
r
iable
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-06-25
Sven Stri
c
kroth
Use
h
i
gher resolu
t
ion time
s
tamp
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-06-25
Sv
e
n Strickroth
Drop unused m_TreeHash
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-06-25
Sven
Strickroth
TGitCache: Also c
o
nsider f
i
le
size for check
i
n
g
fr
e
shnes
s
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-06-25
S
ve
n
Strickrot
h
R
e
place deprec
a
ted func
t
ional objects
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-06-25
Sv
e
n S
t
r
i
ckro
t
h
Correctly set
C
C
r
ecipients
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-06-25
S
ven Strickroth
Fixed
i
s
su
e
#3005
:
To
r
to
i
seGit does
n
ot support cloning
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-06-25
Sven Strickr
o
t
h
GitSta
t
usLis
t
:
Extend co
p
y options
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-06-25
Sven S
t
rick
r
o
t
h
GitStatusList: Centr
a
lize GetCellText
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-06-25
Sv
e
n Str
i
ckroth
GitStatusListCtrl
:
B
e
tt
e
r
l
oc
k
ing
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-06-24
Sven
S
trickroth
Constify CTGitPath::GetAbbrevi
a
tedRenam
e
()
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-06-24
Sven Strick
r
oth
GitStatusLis
t
Ctrl: Us
e
logi
c
a
l so
r
t
if
en
a
bled (
a
s
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-06-24
S
v
e
n
Strickroth
CGi
t
StatusL
i
stCtrl: Use stable sort
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-06-24
Sven Str
i
ckroth
D
rop
u
nimplemented
m
e
tho
d
s
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-06-24
Sven Strick
r
oth
Honor rule
of
f
ive
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-06-20
S
ve
n
S
trickr
o
th
Drop decl
a
red but not de
f
ined m
e
thods
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-06-20
S
v
en
Strickroth
Call Get
S
elec
t
edCo
u
nt()
just once
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-06-19
Sven Str
i
c
k
ro
t
h
Also us
e
normalized paths for the index
a
nd HEAD t
r
e
e
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-06-19
Sv
e
n St
r
ickroth
Drop unused
method
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-06-18
Sven Strickroth
Use GetTic
k
Co
u
nt64
i
nstead o
f
GetCurrentTi
m
e
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2017-06-18
Sven Stric
k
ro
t
h
Add NU
L
L
checks
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
next
