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
v
en Strickroth
F
ixed issue
#
23
4
8
:
C
onflicts duri
n
g
reb
a
se appends
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-11-17
S
v
en
S
trickroth
Fix typo
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-11-17
Sven Stri
c
kroth
Do not report fold
e
r statu
s
for files
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-11-16
Sven S
t
ric
k
roth
Disable "This feature
w
ill be installed when r
e
quired
.
"
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-11-15
Sven Strickro
t
h
Correctly update fol
d
er status on file
c
ha
n
ge and propa
g
a
t
e
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-11-15
Sv
e
n Strickroth
Fix
e
d issue
#2312: Fix UTF-8
AutoCRLF i
s
s
ues wi
t
h libgit2
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-11-11
Sven Strick
r
oth
Fixed i
s
sue #2311: Empty
commits cannot
b
e
r
e
based
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-11-11
Sven
S
t
r
i
c
k
r
oth
Me
r
ge branch 'rebase-s
p
lit-comm
i
t
s
'
commit
|
commitdiff
|
tree
2014-11-11
Sven Strickroth
D
i
s
ab
l
e Amend if
cherry pick i
s
ac
t
ive is
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-11-11
Sve
n
Strick
r
oth
Do not disab
l
e Amend if e
r
ror occurred
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-11-11
Sve
n
St
r
ickroth
RebaseDlg: Allow to spl
i
t co
m
mits
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-11-10
Alek
s
e
y
Vasenev
Fixed
iss
u
e #2342: Ign
o
re whitespace blame option does
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-11-08
Sv
e
n Strickroth
F
ixed
i
s
s
ue #1872: Rebase ed
i
t doesn't
a
mend files
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-11-08
Sven Str
i
ckroth
Fixed issue #2340: Error d
i
alog shown
w
hen
editing
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-11-07
Sven Strickroth
Fixed issue #2341: Jump to search box whe
n
press
i
ng
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-11-06
Sven Strickroth
Set
t
he priority of the cra
w
ler threa
d
, not the calling
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-11-02
Sven S
t
r
i
c
kroth
A
fter removing a
v
aria
b
le
from CEnvironment
t
he envi
r
on
m
e
n
t
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-11-02
Yue Lin Ho
Document naviga
t
i
o
n to a separate section
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-11-02
Sve
n
Strickroth
Auto-
t
o
g
gle "Rebase a
f
ter" i
n
Pu
l
l and
F
etch Di
a
log
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-11-02
S
v
en
Stri
c
kroth
Disable
"r
e
base after" checkbox if remote
i
s a URL
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-11-02
S
ven
Stri
c
kroth
Drop
"allowR
e
base" paramet
e
r
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-11-02
Sven Stric
k
r
o
th
Make s
u
re rebas
e
is ne
v
er exe
c
uted
on CLI on pul
l
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-11-02
Yue Lin
H
o
D
e
n
ser control p
o
sitioning
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-31
Sven Strickroth
F
i
xed issue #2332
:
To
r
toiseGitM
e
rge:
M
ove "Create patch
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-31
Sven Strickro
t
h
Do not ope
n
R
e
baseDlg twice af
t
er
F
e
tc
h
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-31
Sven Strickroth
Fixed issu
e
#2330: Optimize submodule conflict re
s
olution
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-31
Sven
S
t
ric
k
roth
All
o
w to resolve s
u
bmodul
e
conf
l
ict
s
and updat
e
li
s
t
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-31
Sven Strickroth
Re
f
a
c
t
ored: Mov
e
confli
c
t
r
e
solve c
o
de to
C
AppUtils
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-31
Sven
Strickroth
A
d
d r
e
s
o
l
v
e subm
o
dule
c
o
nflict
d
ialog
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-31
Sven Str
i
c
k
ro
t
h
Refactored:
M
ove some logic to
CGitDiff
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-31
Sven Stric
k
roth
Fixed i
s
sue #1950: Log Di
a
log:
File list filter
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-31
S
v
en Stri
c
kroth
F
i
x
ed issue #2157:
T
o
r
toiseGitM
e
rge does
n
ot delete
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-31
S
ven Strickroth
Add F
E
TCH
_
HEAD t
o
Log Di
a
l
o
g br
a
nch
s
e
l
ector
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-31
Sve
n
S
t
rick
r
oth
C
o
nstify methods
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-31
Sven Stric
k
roth
Fix
s
ome possible
s
ign
e
dness proble
m
s
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-30
Yue L
i
n Ho
M
in
o
r
code i
m
prov
e
ments
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-30
Sven Strickroth
F
i
x "move" mi
s
sing on
drag context menu on empt
y
ve
r
sioned
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-30
Sup Yut
S
um
F
i
xe
d
issue
#
2331: Show prefix log asterisk i
n
L
og
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-29
Sven
S
tri
c
kroth
Drop logically
d
ead code
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-29
S
v
en
Strickr
o
th
Sync with Tortoi
s
eSVN
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-27
S
v
e
n
Strickroth
Update documen
t
ation
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-26
Sven
S
trickroth
Update do
c
u
ment
a
tion for proxy se
r
ver
c
onf
i
guratio
n
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-25
Sven Strickrot
h
Fix bor
d
ers: CSVNIg
n
ore
T
ype
D
lg is not
resi
z
able
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-25
Sven S
t
rickroth
D
o not
s
how pr
o
gre
s
s dialog if canceled
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-25
Sven
St
r
ickr
o
th
Add help butt
o
n to crea
t
e re
p
ository dialog
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-25
Sven Strickroth
I
nitialize
a
ll memb
e
r var
i
a
bles
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-25
S
ven S
t
r
i
ck
r
o
t
h
D
r
op unused code
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-25
S
v
en Strickroth
Sync with T
o
r
t
oiseSVN
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-25
Sve
n
Strickroth
F
ixe
d
issu
e
#2176: Color config for "View Patch" Window
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-23
Sven
Strickroth
C
orrectly set text
c
olor on annotate
d
c
o
mmi
t
s
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-21
Sven
St
r
ickroth
Ch
e
ck
f
ile size before ch
e
cki
n
g cont
e
nt
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-21
Sven
S
trickroth
Fixed issue #2
3
27: Help butt
o
n is broken
i
n "S
V
N
Commit
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-18
Sven Strick
r
oth
Right
a
l
ign numbers
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-18
S
ven Strickroth
Adjust check
b
o
x
and radio control
w
idths to re
q
uired
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-17
S
v
en Strickroth
Use "Check certifica
t
e" dialog al
s
o for SMTP sessions
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-17
Sven Strickroth
Fixed issue #2294: Submod
u
le Update dialog doesn't
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-17
Sven Strickroth
Fix warn
i
n
g
s
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-17
Sven Strickroth
Optimi
z
e control wid
t
hs
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-17
Sven Strickroth
Merge br
a
n
c
h 'git-desc
r
ibe'
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-17
S
u
p Yu
t
S
um
Can
set
describe options
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-17
Sup
Yut
Su
m
Implem
e
n
t git describe in Log Dialog
commit
|
commitdiff
|
tree
2014-10-17
Sven Strickroth
F
i
x
c&p
error in
error me
s
sage
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-16
S
v
en S
t
r
ickroth
Al
l
ow repairing f
r
om the
c
o
nt
r
ol
panel
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-14
Sven
Stri
c
k
r
oth
D
o
n't
hard
-
code git hash si
z
e
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-11
Sven
S
tric
k
rot
h
Reset: Show pr
o
gr
e
ss and handle
d
files when used
with
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-11
Sven Strick
r
oth
Merg
e
br
a
n
ch
'libgit2-certcheck'
commit
|
commitdiff
|
tree
2014-10-11
Sven Strickroth
Ad
d
certifica
t
e c
h
eck dialog
f
or
u
n
k
nown/sel
f
-
s
igned
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-11
S
v
en Strickroth
Up
d
ate libgit
2
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-08
Sve
n
St
r
ickroth
Merg
e
branch 'log-
d
lg-selection-history'
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-08
S
ven
S
t
r
i
ckro
t
h
Document
n
avigation through the sel
e
ction history
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-08
Yue Lin
H
o
Prevent p
o
s
s
i
ble e
n
dle
s
s going b
a
ck
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-08
David E
l
lswort
h
Bi
n
d m
o
u
s
e back/forw
a
rd
b
uttons for
n
avigating the
.
.
.
commit
|
commitdiff
|
tree
2014-10-08
Sven S
t
rickroth
A
d
d
j
u
mp to w/o selecting a commit to find dialog
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-08
S
ven S
t
rickroth
I
ntroduce ALT+SHIFT for
navi
g
a
t
ing
t
he h
i
story
w
/o
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-07
Sven Str
i
c
k
roth
Fix typo
i
n changelog
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-07
Sven Stric
k
r
o
t
h
Merge branch '
s
cintill
a
-3
.
5
.
1'
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-07
S
u
p
Y
u
t Sum
Appl
i
e
d
uni
c
odefon
t
.
patch
commit
|
commitdiff
|
tree
2014-10-07
Sve
n
Strickroth
Adjust
e
d and a
p
p
lied backgroundcolors
.
p
a
tch
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-07
S
v
e
n
Strickroth
Update Scintil
l
a t
o
v
ersion 3
.
5
.
1
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-06
Yue
Lin
Ho
A
d
d
h
otkey
s
for comm
i
t
j
u
mp up/down
commit
|
commitdiff
|
tree
2014-10-06
Sven Strickro
t
h
Dr
o
p useles
s
c
heck: location is
u
nsigned an
d
, thus
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-05
Sven Strickroth
Drop
p
r
e
- an
d
post-
b
ui
l
d event
s
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-05
S
v
e
n
Stric
k
roth
For ol
d
relea
s
es only uploa
d
mini dumps
w
/
o
memory
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-05
Sven Strickroth
P
revent possib
l
e
r
e
mote code down
l
oad and exe
c
ut
i
on
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-05
S
v
en S
t
rickroth
Fi
x
prefix
w
hich is i
g
nored
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-05
S
v
en Stri
c
k
r
oth
Merge branch 'select
i
on-navigation'
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-05
Yu
e
Lin
Ho
Navigate
selection history via log
jump up/
d
own button
commit
|
commitdiff
|
tree
2014-10-05
Yu
e
Lin Ho
F
ixed issue #1928: Hotkeys in "Sh
o
w lo
g
"
dialog for
.
.
.
Initial design by
Sven Strickroth
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-05
Sve
n
S
trickr
o
th
Merge branch 'p
u
ll-rebase'
commit
|
commitdiff
|
tree
2014-10-05
Y
ue Li
n
Ho
Support branch
.
<
n
ame>
.
re
b
ase and
p
u
ll
.
rebase
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-05
Yue Lin Ho
F
i
x
ed issu
e
#874: A
d
d --rebase o
p
t
ion to pull d
i
alog
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-05
Y
u
e Lin Ho
Re-
u
s
e
CAppUti
l
s:
:
Reba
s
eAfterFetc
h
() in Sync dialog
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-03
Sven St
r
ickroth
All
o
w
to canc
e
l cloning when using libgit2
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-03
S
v
e
n
Strickroth
Block workin
g
tree
while cl
o
n
i
ng when
using libgit2
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-03
Sven S
t
ri
c
kroth
Fix
r
ead
i
ng multiline entries fr
o
m the ini fi
l
e on
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-03
Sven St
r
ickroth
Merg
e
branch
'
dr
d
ump'
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-03
Sven Strick
r
oth
Make
i
t compile w
i
t
h
older SDKs
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-03
Sven
Strickr
o
th
Sy
n
c
DrDump crash handle
r
with TortoiseSVN cod
e
base
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-03
Sven Strick
r
oth
Optimize length check
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
2014-10-02
Sven S
t
ri
c
k
r
o
t
h
Drop "conf
i
gure syst
e
m sounds" button
f
r
o
m settings
.
.
.
Signed-off-by:
Sven Strickroth
<email@cs-ware.de>
commit
|
commitdiff
|
tree
next