| commit | 2740f9c047f8789f53fbc13ed7d8701a9be5f0fe | |
| author | Yue Lin Ho <b8732003@student.nsysu.edu.tw> | |
| Fri, 26 Sep 2014 07:28:28 +0000 (26 15:28 +0800) | ||
| committer | Sven Strickroth <email@cs-ware.de> | |
| Sun, 5 Oct 2014 10:53:04 +0000 (5 12:53 +0200) | ||
| tree | 4f55756ada486f53ad101d8a648056e87020d3a2 | treesnapshot (tar.gz zip) |
| parent | bdbad7a2585ac2bcd6d629b1047461fe1a119f51 | commitdiff |
Fixed issue #874: Add --rebase option to pull dialog
"--rebase" option is introduced by 25bd4c961830590ffdb51202e935fd168b7b2484,
but further work is needed.
So, the "Launch Rebase After Fetch" checkbox is hidden from Pull dialog.
For the conflict reason, the Rebase dialog uses cherry pick (instead of "--rebase" option) to perform rebase function.
And CLI option "--rebase" cannot be used. (never and ever)
Therefor, if "Launch Rebase After Fetch" checkbox is checked in Pull dialog,
then "git.exe pull --rebase" is adapted to "Fetch & Rebase".
Signed-off-by: Yue Lin Ho <b8732003@student.nsysu.edu.tw>
Signed-off-by: Sven Strickroth <email@cs-ware.de>
"--rebase" option is introduced by 25bd4c961830590ffdb51202e935fd168b7b2484,
but further work is needed.
So, the "Launch Rebase After Fetch" checkbox is hidden from Pull dialog.
For the conflict reason, the Rebase dialog uses cherry pick (instead of "--rebase" option) to perform rebase function.
And CLI option "--rebase" cannot be used. (never and ever)
Therefor, if "Launch Rebase After Fetch" checkbox is checked in Pull dialog,
then "git.exe pull --rebase" is adapted to "Fetch & Rebase".
Signed-off-by: Yue Lin Ho <b8732003@student.nsysu.edu.tw>
Signed-off-by: Sven Strickroth <email@cs-ware.de>
| src/Changelog.txt | diffblobblamehistory | |
| src/TortoiseProc/AppUtils.cpp | diffblobblamehistory | |
| src/TortoiseProc/PullFetchDlg.cpp | diffblobblamehistory |