- Apr 24, 2013
-
-
Petar Perisin authored
it looks like submodule list in git config does not return paths. that is why I have direct reading of .gitmodules file now. Change-Id: I7f441d0b2e31ad7b73fbc8c05e5c9a9e0c84036c Reviewed-by:
Orgad Shaneh <orgads@gmail.com>
-
- Apr 21, 2013
-
-
Petar Perisin authored
Change-Id: I83a00e9677924efc244a91d20cdded77ee9cdff0 Reviewed-by:
Orgad Shaneh <orgads@gmail.com>
-
Petar Perisin authored
Change-Id: I3dd274ad827c7cbd94d849b991cc518eff7f18ae Reviewed-by:
Orgad Shaneh <orgads@gmail.com>
-
- Apr 19, 2013
-
-
Orgad Shaneh authored
Remove enum, provide the associated flag in the combobox. Change-Id: I1c4751c75f59312904fe7c175678f965ac16741d Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
Petar Perisin authored
Change-Id: I19ecde462d7a8a5fb00caa0414a9833ecab5057b Reviewed-by:
Orgad Shaneh <orgads@gmail.com>
-
- Apr 11, 2013
-
-
Petar Perisin authored
Change-Id: I74e010af7bff046647ac75e731a87867ff34b0f1 Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com> Reviewed-by:
Orgad Shaneh <orgads@gmail.com>
-
- Apr 08, 2013
-
-
Petar Perisin authored
Change-Id: Ibda70cb896633cc7afa3a845b99aac523246c558 Reviewed-by:
Orgad Shaneh <orgads@gmail.com> Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
- Apr 05, 2013
-
-
Petar Perisin authored
Change-Id: Ic16eae2def11343ef7be5ce8378d24b5fd11a386 Reviewed-by:
Petar Perisin <petar.perisin@gmail.com> Reviewed-by:
Orgad Shaneh <orgads@gmail.com> Reviewed-by:
Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
Petar Perisin authored
Change-Id: I3cc8f1d19784145a7fbf19c321ccbc079847fbc2 Reviewed-by:
Orgad Shaneh <orgads@gmail.com> Reviewed-by:
Petar Perisin <petar.perisin@gmail.com> Reviewed-by:
Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
- Apr 04, 2013
-
-
Petar Perisin authored
Change-Id: If8a4b0c572b0ca2d57f80f1304c7ebf141a40148 Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com> Reviewed-by:
Orgad Shaneh <orgads@gmail.com>
-
Petar Perisin authored
Change-Id: I9446060b9a8ee1717b832f1f7b7dbcaf8e739ad3 Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com> Reviewed-by:
Orgad Shaneh <orgads@gmail.com>
-
- Apr 02, 2013
-
-
Petar Perisin authored
No extra terminal commands are executed. Change-Id: Ia875b5dbce2784962b9fc2b7c9c1b0a696a02ec8 Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com> Reviewed-by:
Orgad Shaneh <orgads@gmail.com> Reviewed-by:
Petar Perisin <petar.perisin@gmail.com>
-
- Mar 15, 2013
-
-
Orgad Shaneh authored
Change-Id: I3d106ce5b071df4a7a3d77be43e7c24bd7c91dfa Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
Orgad Shaneh authored
Qt Creator runs Git in a "dumb" terminal which does not allow opening an editor. Use Qt Creator itself as an editor when needed. Change-Id: Ide073299964803d02479dade24ddee0283ebd83b Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
Orgad Shaneh authored
Git might request an editor on continue Change-Id: I374e9889e32ea1b1b5ed04f9be9d2a829f3b6440 Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com> Reviewed-by:
Petar Perisin <petar.perisin@gmail.com>
-
Orgad Shaneh authored
Change-Id: I2107a2fad456d52989002e560750af78281bd5db Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
- Mar 01, 2013
-
-
Orgad Shaneh authored
Needed for interactive rebase Change-Id: I5ba82735f6521087e7d23d8ee3e1beacd10db30a Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
Orgad Shaneh authored
Change-Id: Id33f3ff4b79242e6e86ff51a1699fe41df022bf9 Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
- Feb 27, 2013
-
-
Orgad Shaneh authored
Change-Id: I4afd7ba6ccce650711df4239d89d1b7643a2373b Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
- Feb 12, 2013
-
-
Orgad Shaneh authored
Change-Id: I75bb18c9564ffac3de2654bd388465794481b487 Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
Orgad Shaneh authored
Change-Id: I398437db96082e8813090b5eb78ae1c8b8158ffe Reviewed-by:
Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
- Jan 29, 2013
-
-
Robert Loehning authored
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205 Reviewed-by:
Kai Koehne <kai.koehne@digia.com>
-
- Jan 24, 2013
-
-
Orgad Shaneh authored
Other refs can also be checked out using this function Change-Id: I80a1c15244b1043cfce650a121c71174b9d322cb Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
Orgad Shaneh authored
Change-Id: I6cb9752f435255379cf7a8a321b3192a410d91df Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
Orgad Shaneh authored
Change-Id: I7c9059396aaac78c769518b34c7bf68bfe9932ec Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com> Reviewed-by:
Petar Perisin <petar.perisin@gmail.com>
-
Orgad Shaneh authored
Offers the user to stash changes (if relevant), stores the results and pops the stash when it goes out of scope (unless disabled) Change-Id: Ibc0d2a5d3e3c953062fb17ecba903ca814524837 Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
Orgad Shaneh authored
If the user created another stashed between save and pop, this stash will be restored instead of the intended one. Change-Id: I605c9f440345d8c7e0876f4f60daa7146bebb212 Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
- Jan 23, 2013
-
-
Tobias Hunger authored
Change-Id: Ie17ac67829d647572f52f51d0a5aea6f3622bbc8 Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
Orgad Shaneh authored
When flags are not used. syncStash doesn't return result, which can be useful for StashGuard Change-Id: I1327b5d8d10410e7a3b9fdb07a03b476d5abcdc4 Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
Orgad Shaneh authored
... when the stash should be removed on successful pop Change-Id: I39b2c01b0a518d3c70bcb8dc898191cca6d3e84d Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
- Jan 21, 2013
-
-
Petar Perisin authored
Change-Id: Ic8ba7434e79b12eca680a67c2845c82915dc0088 Reviewed-by:
Orgad Shaneh <orgads@gmail.com> Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
- Jan 17, 2013
-
-
Petar Perisin authored
Better overview in stash dialog. Change-Id: Icb6d3f8e2e068882e661e017ce8a0bb00ec6dba5 Reviewed-by:
Orgad Shaneh <orgads@gmail.com> Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
- Jan 11, 2013
-
-
Petar Perisin authored
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>
-
- Jan 10, 2013
-
-
Petar Perisin authored
Rebase on pull should check if branch configuration has rebase set to true. This is important to correctly abort operation when conflicts appear, and user chooses not to run mergetool Change-Id: I365aa534bdbece466514f542ea2e3c371c89a4a8 Reviewed-by:
Orgad Shaneh <orgads@gmail.com> Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
- Jan 09, 2013
-
-
Petar Perisin authored
Added Soft Reset to Reset Dialog Change-Id: Iba5b6a37aef2b89c998c21a3d8ecca1075cbda10 Reviewed-by:
Orgad Shaneh <orgads@gmail.com> Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
- Jan 07, 2013
-
-
Petar Perisin authored
Added git functions - "Merge" and "Rebase" They are in the "Branches" dialog: - Merge - merge selected branch into current one - Rebase - rebase current branch on selected one Task-number: QTCREATORBUG-8367 Change-Id: I9ed306c64d5d4b7bd1d58730a5e1009f0bd4ec0e Reviewed-by:
Orgad Shaneh <orgads@gmail.com> Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
- Dec 30, 2012
-
-
Orgad Shaneh authored
Submodules are not stashed and are not considered a conflict after revert Change-Id: I97a0792db615054622b9b67a7f6b58b5aee05273 Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
- Dec 12, 2012
-
-
Petar Perisin authored
Launch gitk only for current file, or for the folder that current file belongs to Task-number: QTCREATORBUG-8327 Change-Id: I2ffbd44e3b3eeaffad32e84af9ca2085b16fdaa2 Reviewed-by:
Orgad Shaneh <orgads@gmail.com> Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
- Nov 30, 2012
-
-
Orgad Shaneh authored
Change-Id: I272e9db7a560f6e72dda6a0368d463da820f5b0b Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
Orgad Shaneh authored
Known limitation: Commit that has a tag shows its own tag on Precedes field Change-Id: I533e48b4bb5d57809d8e9f12fa7db5d8706f7372 Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-