repo.or.cz
/
TortoiseGit.git
/
tree
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
history
|
HEAD
|
snapshot (
tar.gz
zip
)
Fixed issue #2785: Rebase/Cherry-pick with conflict in renamed file fails
[TortoiseGit.git]
/
src
/
TortoiseProc
/
Commands
/
tree
15d1a4de4159fd3aa978326aeb5ad2d0c7c163d1
drwxr-xr-x
..
-rw-r--r--
1020
AboutCommand.cpp
blob
|
blame
|
history
|
raw
-rw-r--r--
1060
AboutCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
2197
AddCommand.cpp
blob
|
blame
|
history
|
raw
-rw-r--r--
1056
AddCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
1162
AutoTextTestCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
2085
BisectCommand.cpp
blob
|
blame
|
history
|
raw
-rw-r--r--
998
BisectCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
1188
BlameCommand.cpp
blob
|
blame
|
history
|
raw
-rw-r--r--
1084
BlameCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
1146
BranchCommand.cpp
blob
|
blame
|
history
|
raw
-rw-r--r--
1064
BranchCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
3618
CatCommand.cpp
blob
|
blame
|
history
|
raw
-rw-r--r--
1072
CatCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
8736
CleanupCommand.cpp
blob
|
blame
|
history
|
raw
-rw-r--r--
1063
CleanupCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
7690
CloneCommand.cpp
blob
|
blame
|
history
|
raw
-rw-r--r--
1109
CloneCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
10778
Command.cpp
blob
|
blame
|
history
|
raw
-rw-r--r--
3019
Command.h
blob
|
blame
|
history
|
raw
-rw-r--r--
2126
CommitCommand.cpp
blob
|
blame
|
history
|
raw
-rw-r--r--
1152
CommitCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
1185
ConflictEditorCommand.cpp
blob
|
blame
|
history
|
raw
-rw-r--r--
1078
ConflictEditorCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
1062
CopyCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
1641
CrashCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
3676
CreateRepositoryCommand.cpp
blob
|
blame
|
history
|
raw
-rw-r--r--
1118
CreateRepositoryCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
3049
DaemonCommand.cpp
blob
|
blame
|
history
|
raw
-rw-r--r--
1046
DaemonCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
5251
DiffCommand.cpp
blob
|
blame
|
history
|
raw
-rw-r--r--
1059
DiffCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
6196
DropCopyAddCommand.cpp
blob
|
blame
|
history
|
raw
-rw-r--r--
1103
DropCopyAddCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
4489
DropCopyCommand.cpp
blob
|
blame
|
history
|
raw
-rw-r--r--
1061
DropCopyCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
4492
DropMoveCommand.cpp
blob
|
blame
|
history
|
raw
-rw-r--r--
1060
DropMoveCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
1100
ExportCommand.cpp
blob
|
blame
|
history
|
raw
-rw-r--r--
1062
ExportCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
1235
FetchCommand.cpp
blob
|
blame
|
history
|
raw
-rw-r--r--
1109
FetchCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
2437
FormatPatchCommand.cpp
blob
|
blame
|
history
|
raw
-rw-r--r--
1069
FormatPatchCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
1195
HelpCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
2191
IgnoreCommand.cpp
blob
|
blame
|
history
|
raw
-rw-r--r--
1062
IgnoreCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
2194
ImportPatchCommand.cpp
blob
|
blame
|
history
|
raw
-rw-r--r--
1069
ImportPatchCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
3513
LogCommand.cpp
blob
|
blame
|
history
|
raw
-rw-r--r--
1056
LogCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
1087
MergeCommand.cpp
blob
|
blame
|
history
|
raw
-rw-r--r--
1060
MergeCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
4261
PasteCopyCommand.cpp
blob
|
blame
|
history
|
raw
-rw-r--r--
1061
PasteCopyCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
4920
PasteMoveCommand.cpp
blob
|
blame
|
history
|
raw
-rw-r--r--
1060
PasteMoveCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
1801
PrevDiffCommand.cpp
blob
|
blame
|
history
|
raw
-rw-r--r--
1052
PrevDiffCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
1049
PropertiesCommand.cpp
blob
|
blame
|
history
|
raw
-rw-r--r--
1074
PropertiesCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
1240
PullCommand.cpp
blob
|
blame
|
history
|
raw
-rw-r--r--
1108
PullCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
1347
PushCommand.cpp
blob
|
blame
|
history
|
raw
-rw-r--r--
1108
PushCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
1689
RTFMCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
1543
RebaseCommand.cpp
blob
|
blame
|
history
|
raw
-rw-r--r--
1064
RebaseCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
1349
RebuildIconCacheCommand.cpp
blob
|
blame
|
history
|
raw
-rw-r--r--
1079
RebuildIconCacheCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
1057
RefBrowseCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
1137
RefLogCommand.cpp
blob
|
blame
|
history
|
raw
-rw-r--r--
993
RefLogCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
5577
RemoveCommand.cpp
blob
|
blame
|
history
|
raw
-rw-r--r--
1064
RemoveCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
2341
RenameCommand.cpp
blob
|
blame
|
history
|
raw
-rw-r--r--
1064
RenameCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
1289
RepoStatusCommand.cpp
blob
|
blame
|
history
|
raw
-rw-r--r--
1085
RepoStatusCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
1365
RepositoryBrowserCommand.cpp
blob
|
blame
|
history
|
raw
-rw-r--r--
1078
RepositoryBrowserCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
1261
RequestPullCommand.cpp
blob
|
blame
|
history
|
raw
-rw-r--r--
1087
RequestPullCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
2544
ResolveCommand.cpp
blob
|
blame
|
history
|
raw
-rw-r--r--
1064
ResolveCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
1473
RevertCommand.cpp
blob
|
blame
|
history
|
raw
-rw-r--r--
1062
RevertCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
1235
RevisionGraphCommand.cpp
blob
|
blame
|
history
|
raw
-rw-r--r--
1107
RevisionGraphCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
1000
SVNDCommitCommand.cpp
blob
|
blame
|
history
|
raw
-rw-r--r--
1063
SVNDCommitCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
2716
SVNFetchCommand.cpp
blob
|
blame
|
history
|
raw
-rw-r--r--
1061
SVNFetchCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
1812
SVNIgnoreCommand.cpp
blob
|
blame
|
history
|
raw
-rw-r--r--
1062
SVNIgnoreCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
5112
SVNRebaseCommand.cpp
blob
|
blame
|
history
|
raw
-rw-r--r--
1109
SVNRebaseCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
1008
SendMailCommand.cpp
blob
|
blame
|
history
|
raw
-rw-r--r--
1067
SendMailCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
1235
SettingsCommand.cpp
blob
|
blame
|
history
|
raw
-rw-r--r--
1066
SettingsCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
1405
ShowCompareCommand.cpp
blob
|
blame
|
history
|
raw
-rw-r--r--
1120
ShowCompareCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
1243
StashCommand.cpp
blob
|
blame
|
history
|
raw
-rw-r--r--
1250
StashCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
5929
SubmoduleCommand.cpp
blob
|
blame
|
history
|
raw
-rw-r--r--
1440
SubmoduleCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
1075
SwitchCommand.cpp
blob
|
blame
|
history
|
raw
-rw-r--r--
1098
SwitchCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
1387
SyncCommand.cpp
blob
|
blame
|
history
|
raw
-rw-r--r--
1064
SyncCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
1206
TagCommand.cpp
blob
|
blame
|
history
|
raw
-rw-r--r--
1061
TagCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
2943
UnIgnoreCommand.cpp
blob
|
blame
|
history
|
raw
-rw-r--r--
1067
UnIgnoreCommand.h
blob
|
blame
|
history
|
raw
-rw-r--r--
1145
UpdateCheckCommand.cpp
blob
|
blame
|
history
|
raw
-rw-r--r--
1083
UpdateCheckCommand.h
blob
|
blame
|
history
|
raw