Robert Loehning
376a90e028
Added second button to message box
...
Change-Id: I59ec1c5000afcdd2c91ed55c32aaae11b95b620a
Reviewed-by: Orgad Shaneh <orgads@gmail.com >
2013-04-08 08:58:20 +02:00
Orgad Shaneh
34fd5ca532
Git: Handle "no changes" case on conflict resolving
...
Change-Id: I75bb18c9564ffac3de2654bd388465794481b487
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-02-12 18:41:39 +01:00
Leena Miettinen
6b27295b92
UI text: edit merge tool message
...
Change-Id: I225f4ec11bc365b48b9f18ae993cbd7dd52f1a7c
Reviewed-by: Orgad Shaneh <orgads@gmail.com >
2013-02-12 17:05:41 +01:00
Leena Miettinen
2473349c3d
UI text: fix git cherry-picking strings
...
Fix grammar and capitalization.
Change-Id: Iccabb01c72783f486cdb7d574c2cbb942d4d1cfe
Reviewed-by: Orgad Shaneh <orgads@gmail.com >
2013-02-09 19:27:47 +01:00
Robert Loehning
a040424d2a
Incremented year in copyright info
...
Change-Id: Ia11f4d7a94465de7f12cc390855e54e3256e5455
Reviewed-by: Kai Koehne <kai.koehne@digia.com >
2013-02-01 09:19:26 +01:00
Petar Perisin
65aef73ec4
Git: Added Revert and cherry-pick
...
Change-Id: Ic8ba7434e79b12eca680a67c2845c82915dc0088
Reviewed-by: Orgad Shaneh <orgads@gmail.com >
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-01-21 10:41:01 +01:00
Orgad Shaneh
9417bea9ac
VCS: Remove superfluous virtual
...
Change-Id: I105057202091f4b90f7f50eefb3506ee56d4bc1b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-01-18 11:43:17 +01:00
Orgad Shaneh
c212e081a5
Git: Use configured binary for merge tool
...
Change-Id: I27fc6f5137db81214a9f0f4cab9a6f8812d275a8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-01-16 16:15:45 +01:00
Petar Perisin
40eecd87c9
Git: Refactored "synchronousPullOrRebase" to be more general.
...
This can ease adding commands that can cause conflicts like cherry-pick,
revert, merge, rebase, stash pop ...
Change-Id: Id9df7f11307dbbcb60036a20a2c22c5097ba239f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-01-11 10:58:17 +01:00
Orgad Shaneh
3e9f2d688c
Git: Suggest continuing rebase after conflicts are resolved
...
Change-Id: Icf74397ee7a3cedd7e46c63777832e1fc9f46033
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2012-11-16 14:12:47 +01:00
Orgad Shaneh
7ba0433b2b
Git: Write mergetool input/output to VCS output window
...
Change-Id: I75fdf1535da610e6300c76a0b11b3ae032899484
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2012-11-16 14:12:11 +01:00
Orgad Shaneh
cf6298ff32
Git: Introduce MergeTool support
...
Change-Id: I906c3c692d9f4819bdf2a1489c42ae04f292894d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2012-11-07 16:12:27 +01:00
