feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
20,416 Commits 108 Branches 368 Tags
bf8cb5d4fce66010a8f1c22ccc49cb5e15f55ef4
Commit Graph

20 Commits

Author SHA1 Message Date
Tobias Hunger
bf4ca06c1e Fix possible crash in git branch dialog 
Do not crash when checking out a branch while not currently
on any branch.

Task-number: QTCREATORBUG-5784
Change-Id: I5d007e91c1778e6f09a5d543990d948bc1427599
Reviewed-on: http://codereview.qt.nokia.com/2958
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2011-08-15 15:01:13 +02:00
Tobias Hunger
2ec4de7ae7 Git: Fix thinko when trying to find merged branches 
Fix thinko when trying to find out whether a branch was merged or not.

Change-Id: I6c4d600508af8a68fe0bac7e61f0b912c43cec32
Reviewed-on: http://codereview.qt.nokia.com/2200
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2011-07-26 17:15:09 +02:00
Tobias Hunger
5f6a91e009 Git: Rework branch dialog 
* Make adding new branches more discoverable
 * Make adding tracking branches more discoverable
 * Update UI

Task-number: QTCREATORBUG-4943
Task-number: QTCREATORBUG-4944
Change-Id: Idcbf5f8321a3bd04c925e33d094bb479788a7d9b
Reviewed-on: http://codereview.qt.nokia.com/588
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-06-22 10:46:48 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers 
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
 2011-05-06 15:17:05 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
con
d1023c7614 It's 2011 now. 
Reviewed-by: hjk
 2011-01-12 09:46:24 +01:00
con
04e32b0049 License headers. 2010-12-17 16:03:42 +01:00
Robert Loehning
0d18732347 VCS[git]: Do not show pseudo branch "(no branch)" 2010-08-27 15:52:16 +02:00
Robert Loehning
5e3eb47e55 Using bold underlined font for active git branch. 2010-05-04 17:29:47 +02:00
Robert Loehning
8e21546009 Fixed parsing of Git branches when current checkout is not on a branch. 2010-03-15 17:14:24 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Friedemann Kleint
18ab532e56 VCS[git]: Make Branchdialog non-modal as is StashDialog. 
Give dialogs a consistent look, set
WA_DeleteOnClose on them and improve updating.
Add a Refresh/Diff buttons to branch dialog.
 2010-01-27 12:47:23 +01:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
Jason McDonald
884b7af769 Update license headers and sales contact details. 
Reviewed-by: Trust Me
 2009-06-17 00:01:27 +10:00
Thorbjørn Lindeijer
b789ffa91b Added and corrected copyright headers 2009-03-20 14:59:12 +01:00
Friedemann Kleint
465bf149d5 Fixes: Using a git configuration with colored output breaks much of the git plugin. 
Task:     248067
Details:  Use --no-color where appropriate. Use a hack to remove color sequences from output for "status" since it does not support the option as of git 1.6.2.
 2009-03-17 12:36:55 +01:00
Friedemann Kleint
94d646a206 Fixes: Added dbl-click handling for remote branches 
Task:
RevBy:
AutoTest:
Details: Moved code to create a local branch from model to dialog which is slightly better since all the modifying app code is there.
 2009-01-09 16:27:42 +01:00
Friedemann Kleint
352cf14353 Fixes: Add way to create a new local branch in the git plugin 
Task: 205821
Details: Split up the branch model into remote branch base class and extended local branch class with <New Branch> row.
 2009-01-07 12:58:31 +01:00
Friedemann Kleint
5b8008609c Compile Windows 2008-12-19 17:44:11 +01:00
Friedemann Kleint
defc270896 Fixes: Start a git branch dialog. 2008-12-19 17:42:08 +01:00