Robert Loehning
|
746c5d8863
|
Incremented year in copyright info
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
2014-01-08 08:29:47 +01:00 |
|
Orgad Shaneh
|
17019955cd
|
Git: Move some functions from MergeTool to GitClient
Needed for interactive rebase
Change-Id: I5ba82735f6521087e7d23d8ee3e1beacd10db30a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
|
2013-03-01 15:25:35 +01: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 |
|
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
|
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 |
|