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 #2348: Conflicts during rebase appends "conflicts" to commit message
2014-11-19
S
ven Strickroth
Fixed issue #2348
:
C
o
nflic
t
s
d
uring
rebase
a
ppends
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-11-17
Sven Str
i
c
kroth
Fix typo
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-11-17
Sven Strickroth
Do not report f
o
lder status
for files
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-11-16
Sven
S
t
ri
c
kroth
Disable
"
This
fe
a
ture will
be inst
a
lled whe
n
required
.
"
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-11-15
Sven Str
i
ckroth
Correctly
u
pdate
f
older status on file change and pr
o
pagate
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-11-15
Sven St
r
ickroth
Fixed issue #2312: Fix UTF
-
8 AutoCRLF iss
u
es wi
t
h li
b
git2
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-11-11
S
v
en Strickroth
Fixed iss
u
e #2311:
E
mpty co
m
m
i
ts cann
o
t be rebased
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-11-11
Sve
n
Strick
r
oth
Merge
b
ra
n
ch 'rebase-s
p
lit-commits'
commit
|
commitdiff
|
tree
2014-11-11
S
ven Strickroth
D
i
s
a
ble
A
mend
i
f ch
e
rry pick is a
c
ti
v
e is
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-11-11
Sven St
r
i
ckroth
Do no
t
disable Amen
d
if error occurred
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-11-11
Sven Strick
r
oth
R
ebaseDlg: Allow to
split
c
omm
i
ts
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-11-10
Ale
k
sey Vasenev
F
ixed i
s
sue #2342:
I
gnore w
h
i
t
e
s
pace blam
e
op
t
ion does
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-11-08
Sven
Str
i
c
k
roth
Fixed issue #1872: Rebase edit d
o
es
n
't
a
mend
files
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-11-08
Sven
S
t
rickroth
F
i
xed issue #2340
:
Error
d
i
alog shown
when
e
d
itin
g
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-11-07
Sven St
r
ickroth
Fixed issue #2341
:
J
u
m
p to sea
r
c
h box
when pressing
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-11-06
Sven Strickro
t
h
Set the pr
i
ori
t
y of the crawler thr
e
ad, not th
e
calling
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-11-02
S
ven Stri
c
kroth
A
f
t
e
r
removing a va
r
iab
l
e f
r
om CEnvir
o
nment t
h
e environment
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-11-02
Yue Lin Ho
Do
c
ument navigat
i
on t
o
a
s
e
parate
s
ection
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-11-02
S
v
en Stri
c
kroth
Au
t
o-toggle "Rebase after
"
in Pu
l
l
and Fetch D
i
alog
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-11-02
Sven
Strickroth
Disable "reba
s
e after" checkbox i
f
remote
i
s a URL
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-11-02
S
v
en Strickroth
Drop
"
allowRebase"
p
arameter
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-11-02
Sven
Strickroth
Make sure rebas
e
is
n
e
ver exe
c
u
ted on CLI o
n
pull
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-11-02
Yue Lin Ho
D
ens
e
r control positioning
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-31
S
v
en Str
i
c
kroth
Fixed issue
#
2332:
T
ortoiseGitMerge: Move "Create patch
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-31
Sv
e
n Strickroth
D
o
not open Reb
a
se
D
lg twice after Fetch
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-31
Sven S
t
rickroth
Fixed i
s
sue #2330: O
p
t
i
mi
z
e sub
m
odul
e
conflict resolution
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-31
S
ven Stric
k
ro
t
h
Allow to resolve sub
m
o
dule conflicts and update list
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-31
Sv
e
n Strickroth
R
e
facto
r
e
d
:
M
o
ve co
n
flict resolve cod
e
to CAppUtils
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-31
Sven S
t
rickroth
Add resolve sub
m
odule
c
o
nflic
t
d
i
alog
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-31
Sven Strickrot
h
Ref
a
ctored
:
Move some logic to
C
GitD
i
f
f
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-31
Sve
n
St
r
i
ckr
o
th
F
i
x
e
d
i
ssue #1950: L
o
g Dialog:
File list filter
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-31
S
ven Str
i
c
kroth
Fixed issue #2157: TortoiseGit
M
erge does no
t
d
e
lete
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-31
Sven S
t
r
i
ckroth
Add
F
ETCH_HEAD to Log Dialog branch select
o
r
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-31
S
ven S
t
rickroth
Consti
f
y
methods
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-31
Sven St
r
ickroth
Fix some possible
s
ignedne
s
s
p
r
oblem
s
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-30
Yue Lin Ho
M
i
n
o
r
code imp
r
ovemen
t
s
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-30
Sve
n
Strickroth
Fix "mov
e
"
m
i
ss
i
ng
on drag
contex
t
menu on empty versioned
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-30
Sup Yut Sum
F
i
xed issue #2331: Show prefix log
as
t
eris
k
in Log
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-29
Sven
S
trickroth
Drop l
o
gically d
e
ad code
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-29
Sven Strickroth
Sync with To
r
toiseS
V
N
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-27
S
v
en Strick
r
oth
Update documen
t
ation
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-26
Sven S
t
rickro
t
h
U
p
d
ate documentation for
p
ro
x
y
s
erver c
o
nfigurati
o
n
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-25
Sven Strickroth
Fi
x
bo
r
ders:
C
SVNIgn
o
reTypeDlg is not resizable
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-25
Sven Stric
k
roth
D
o
not show progre
s
s dialog if cancel
e
d
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-25
Sven
S
t
rick
r
o
th
Ad
d
help button
t
o
c
r
eate
re
p
o
sitor
y
dialog
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-25
Sv
e
n Stric
k
roth
Initialize
a
l
l
me
m
b
er variables
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-25
Sve
n
S
t
rickroth
D
rop unused code
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-25
Sven
Strickrot
h
Syn
c
with Tortoise
S
VN
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-25
Sven Strickroth
Fixed
issue
#2176: Color config for "View Patch"
Window
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-23
Sven Strick
r
oth
C
o
rrectly set text
c
olor on an
n
otat
e
d
c
o
mmits
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-21
Sven Strickroth
Che
c
k file size b
e
fore checking con
t
ent
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-21
S
ven St
r
ickroth
Fixed issue #232
7
: Help b
u
tton
i
s broken in
"
SVN Co
m
mit
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-18
Sve
n
Strickroth
Right al
i
gn numbe
r
s
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-18
Sven Strickro
t
h
Adj
u
s
t
c
heckbox
a
nd rad
i
o con
t
ro
l
widths to
r
equired
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-17
Sv
e
n Strickroth
Use "Check certificat
e
" d
i
alog also for
SMT
P
s
e
ssions
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-17
Sven Strickr
o
th
Fi
x
ed iss
u
e
#2294: Submodule Update dialog do
e
sn't
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-17
Sven Strick
r
oth
Fix w
a
rnings
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-17
Sven Strick
r
oth
Optimize c
o
n
t
rol widths
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-17
Sven
Strickr
o
th
M
erge branch 'git-describe'
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-17
Sup
Yut Su
m
Can set describe options
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-17
S
u
p
Yut Sum
Implement git describe
i
n Lo
g
Dialog
commit
|
commitdiff
|
tree
2014-10-17
Sven Strickrot
h
Fix c&p err
o
r i
n
e
r
ro
r
m
essa
g
e
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-16
Sv
e
n S
t
rickroth
Allow repairin
g
from
the contro
l
panel
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-14
Sven S
t
rickroth
D
on't hard-code git
hash size
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-11
Sven Strickroth
Rese
t
: Sh
o
w pro
g
re
s
s a
n
d handled
f
iles when used wit
h
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-11
Sve
n
S
t
rickroth
Merge
b
ra
n
ch 'libgit2-
c
ertcheck'
commit
|
commitdiff
|
tree
2014-10-11
Sven Strickroth
Add certificate check dialog for unknown/self
-
signe
d
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-11
Sven
S
tr
i
ckr
o
th
Update l
i
bgi
t
2
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-08
S
v
en Strickroth
Merge branc
h
'log-dlg-
s
e
lection-h
i
story'
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-08
Sven St
r
ickroth
Document navigati
o
n
through
t
h
e sel
e
ction hi
s
tory
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-08
Y
ue Lin
Ho
Prevent possible endless
going
b
ack
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-08
David Ellswor
t
h
Bind m
o
use back/f
o
rward bu
t
t
o
ns for n
a
vigatin
g
the
.
.
.
commit
|
commitdiff
|
tree
2014-10-08
Sven
S
trickroth
Add jump to w/o selecting a
c
ommit
t
o f
i
nd dialog
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-08
Sven St
r
ickroth
Intr
o
duc
e
ALT+SHIFT fo
r
navigat
i
ng
the history w/o
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-07
S
v
en
S
t
ric
k
r
ot
h
Fix typo in
changelog
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-07
Sven Strickroth
Me
r
ge branc
h
'scintilla-3
.
5
.
1'
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-07
Sup Yut
S
um
A
p
plied unicodefont
.
patc
h
commit
|
commitdiff
|
tree
2014-10-07
Sven Stri
c
kroth
Adjust
e
d
a
n
d
applied ba
c
kground
c
olors
.
patch
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-07
Sven Strickroth
Update S
c
intilla
t
o version
3
.
5
.
1
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-06
Yue Lin Ho
Add ho
t
k
eys
for com
m
it
j
ump up/
d
own
commit
|
commitdiff
|
tree
2014-10-06
S
ve
n
S
t
rickroth
D
r
op us
e
less check: l
o
cation is un
s
igned and, thus
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-05
Sven Strickroth
Drop
p
r
e
- and post-build events
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-05
Sven Strickroth
Fo
r
old
r
e
lea
s
es only upload mini
dumps w/o me
m
ory
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-05
Sven Strickrot
h
Prevent possible remote code
down
l
oad and e
x
ecution
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-05
Sv
e
n
S
trick
r
oth
Fix prefix which is ig
n
ored
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-05
Sven Strickroth
Me
r
ge
b
ranch 'selection-navigatio
n
'
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-05
Y
u
e
Lin Ho
Nav
i
gate
selection history vi
a
lo
g
ju
m
p up/d
o
wn button
commit
|
commitdiff
|
tree
2014-10-05
Yue L
i
n Ho
Fixed i
s
sue #
1
9
28: H
o
t
keys in
"Show
log" dialog for
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-05
Sven Str
i
c
k
roth
Merge br
a
nch 'pull-rebase'
commit
|
commitdiff
|
tree
2014-10-05
Yue
Lin H
o
Sup
p
ort branch
.
<name>
.
reba
s
e
and pull
.
rebase
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-05
Yu
e
L
i
n
H
o
Fixed
issue
#
8
7
4: Add
-
-
r
ebase option to pu
l
l dialog
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-05
Y
u
e Lin Ho
Re-use
C
AppUt
i
ls::RebaseAfterFetch()
i
n
Sync dialog
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-03
Sven Strickrot
h
Allow to ca
n
ce
l
c
l
oning when using libgit2
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-03
Sven Strickroth
Block worki
n
g tree while clo
n
ing when
using l
i
bgit
2
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-03
Sven S
t
rickroth
Fix readi
n
g multiline
e
ntrie
s
f
rom the ini file on
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-03
Sven Strickroth
Me
r
ge branch
'
d
rdump
'
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-03
Sven Strickrot
h
Make it compile with older SDKs
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-03
Sven Strickroth
Sync DrDump crash handler with Tort
o
ise
S
VN codebase
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-03
Sven Strickroth
Optimize length check
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
2014-10-02
Sve
n
Stric
k
rot
h
Drop "configure system
sounds" button from se
t
tings
.
.
.
Signed-off-by: Sven Strickroth <
email@cs-ware.de
>
commit
|
commitdiff
|
tree
next