Change-Id: I737d2405ef1a10ec451c4baceaea9a0bc194ac1e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: I65ed3e0408e43e354a289bbbd385aec2e254746c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

They're only used in gitclient.cpp, define them there

Change-Id: I601f23a6f2a8e533127d2ed068526815e1b9717d
Reviewed-by: hjk <hjk121@nokiamail.com>

Task-number: QTCREATORBUG-9489

Change-Id: I3ae2e59ccaf397f4236505f21e027a42e2798784
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

Change-Id: I888d4013e88fdc6977f29ef3e27d243e55a1f1a7
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

Rebase --continue might request an editor, which hangs if run
synchronously

Change-Id: I28127884408f6f8fbd351bb1024dc8d3c2b339b8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: I41a9173be2feae4ab529fd9b3f2e1e7cc5ae92ff
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Simplify branch model parsing a bit

Change-Id: Id9e41c6c2769397d6eee3ab74de4afbb94111e25
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>

Calling setExpectChanges after execute is too late

Change-Id: I852c224206fcd758943252029b8e9b050920ca5c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

* git rev-parse --show-toplevel doesn't work inside git dir.
* Only "Describe (show)" should be available for those files. show
  works when running from inside the git dir

Change-Id: If5f3d1af8da2f8d149ac1e03ffd70b530e609557
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: Ia6c929ae64008dcb37695a5358c44096a893e0c4
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: I1926733dc88902e75921a6bfa184e3f6b27ce98d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: I5ac34d96152d6e4f9abc8f6dd18d1e1eab0bde7f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>

Change-Id: I0d5b0eaf562d30f34f01bcf344791a4ce766bdab
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: Idf770a20db66191b4d7fe3a704d31bdce70505c5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: Ic2243adaa36444099f834676186331927f3f4588
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

More in line with current naming conventions.

Change-Id: I63f6677bd12d82f6749032996585d761f1a74fb7
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Change-Id: I546241fb3531cbc542b97d6d0f53382c9225dcf4
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Useful for commit messages with "reverts <hash>" for example.

Can later be extended for interactive rebase

Change-Id: Ibf77433ecddfacbd8d443636ddbc406bda474aa7
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: I013c116fc7e0ac1571513005b8ea49992e0771a3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>

Change-Id: I8462ed07f3d1edce5c7f5ab8c166ce8c68b6d4b3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

* Replace RebaseManager with ConflictHandler
* Store StashGuard in GitClient, allow popping after
  a whole process is done (e.g. pull with resolved conflicts)

Change-Id: I85784f32f515ff896c73f35303c7de26f8006f59
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

...even when NoPrompt is specified

Change-Id: I735133e390403a0f8f6aa573d6f9c63cf0784187
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: Ice9f33e986688e8d2c5250435a30cd7cb1ac3b28
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: I2a40207ed3c4a5c07ba544d681aed6649a0b1a11
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: I7675fc1d994020f94f42f6bd7b4f75aa29e6edf6
Reviewed-by: David Schulz <david.schulz@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

In case it contains the latest remote commit

Change-Id: Id9e4cc40b7d1aa9daac3a9a2cf9ba41f589da7eb
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: Ia2584ff975ed0db614dc878a70ce4adbd5c3ba67
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

If the rebase succeeds without conflicts, pop

Change-Id: I4f0c6ad3061f4f69f7e5c9450f972cce5c15227d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

It is used for both input and output, the pointer is assumed
to be valid

Change-Id: Iad9a82dfb5ea4850584d4da848076699cddd23c2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: I900f3dd89eeeac61e29604ac459d36ecc6c0aa8f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: Ibea0a1f2826c67796a56414326fe6afdee654576
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

* Added a Graph toggle button for log editor
* Hide diff parameters when Diff is off
* Remove GitClient::graphLog

Change-Id: Ib87560bc4d6d7dbe866f0e58db8743a95df0622b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

this is where stash popup question belongs

Change-Id: Ib3435f12eacd0b932ba2a67ecd728e5a41c0c64a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

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>

Change-Id: I83a00e9677924efc244a91d20cdded77ee9cdff0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

Change-Id: I3dd274ad827c7cbd94d849b991cc518eff7f18ae
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

Remove enum, provide the associated flag in the combobox.

Change-Id: I1c4751c75f59312904fe7c175678f965ac16741d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: I19ecde462d7a8a5fb00caa0414a9833ecab5057b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

Change-Id: I74e010af7bff046647ac75e731a87867ff34b0f1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>