development/github-desktop
development/github-desktop
1
0
Fork 0
mirror of https://github.com/desktop/desktop synced 2024-09-13 21:31:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
29935 commits 297 branches 696 tags 363 MiB
Commit graph

29935 commits

This branch
This branch
All branches
Author SHA1 Message Date
tidy-dev d764f5a520 Release 2.8.4 Beta2 2021-06-08 14:30:52 -04:00
tidy-dev 115ad40c12
Merge pull request #12407 from desktop/downgrade-electron-11-1-1 
Downgrade Electron to 11.1.1
 2021-06-08 12:37:17 -04:00
tidy-dev c1c8ae050f
Merge pull request #12405 from desktop/set-source-branch-during-merge-operation 
Set source branch during merge operation for conflicts dialog
 2021-06-08 12:36:09 -04:00
Sergio Padrino 80a560421a Downgrade Electron to 11.1.1 2021-06-08 17:05:41 +02:00
tidy-dev 2a622e514a Set source branch during merge operation for conflicts dialog 2021-06-08 10:31:58 -04:00
tidy-dev c6363442df
Merge pull request #12396 from desktop/rebase-using-new-choose-branch-dialog 
Rebase using new choose branch dialog
 2021-06-08 10:04:33 -04:00
Sergio Padrino bc423a29d4
Merge pull request #12393 from desktop/reset-to-commit 2021-06-08 15:44:18 +02:00
Sergio Padrino 94f0a12905
Merge pull request #12403 from desktop/warn-force-push-reorder 2021-06-08 15:43:34 +02:00
Sergio Padrino 28bd4b3995 Add separator to commit context menu 2021-06-08 13:06:12 +02:00
Sergio Padrino c9e7dae9d5 Hide "Reset to Commit" behind feature flag 2021-06-08 13:06:05 +02:00
Sergio Padrino e7d3330531 Improve documentation 2021-06-08 13:02:06 +02:00
Sergio Padrino 40762c68b5 Reuse existing function to look for remote commits 2021-06-08 13:00:39 +02:00
Sergio Padrino b9bb047580 Add force-push warning to squash operation 2021-06-08 12:54:10 +02:00
Sergio Padrino faf6f92825 Add force-push warning to reorder operation 2021-06-08 12:53:56 +02:00
tidy-dev 44f3a620d3
Update app/src/ui/multi-commit-operation/choose-branch/rebase-choose-branch-dialog.tsx 
Co-authored-by: Sergio Padrino <sergio.padrino@gmail.com>
 2021-06-08 06:05:52 -04:00
Sergio Padrino a6e989fac1 Show warning before resetting if there are changes in the working dir 2021-06-08 11:17:21 +02:00
Sergio Padrino bd983fc2c5 Disable Reset to Commit instead of hiding it 2021-06-08 11:17:21 +02:00
Sergio Padrino 2b61cc01af Initial support for reset to commit 2021-06-08 11:17:10 +02:00
tidy-dev ec29beab23 Remove old choose branch dialog 2021-06-07 13:50:54 -04:00
tidy-dev 2549aba386 Update rebase to use new RebaseChoosBranchDialog 2021-06-07 13:39:54 -04:00
tidy-dev a918f5c927 Rebase choose branch dialog 2021-06-07 12:23:51 -04:00
Sergio Padrino 9e94978b26
Merge pull request #12389 from desktop/undo-state-null 2021-06-07 17:43:11 +02:00
tidy-dev b618498843
Merge pull request #12390 from desktop/squash-merge-abort 
Abort squash merge
 2021-06-07 10:26:37 -04:00
tidy-dev 3c4c000b08
Merge pull request #12382 from desktop/squash-merge-via-branch-menu 
Squash merge via branch menu
 2021-06-07 10:22:37 -04:00
Sergio Padrino fd5dddb727
Merge pull request #12385 from desktop/fix-drag-from-anywhere 
Fix for dragging commits clicking from anywhere in them
 2021-06-07 16:09:12 +02:00
Sergio Padrino aa060e8d4b
Merge pull request #12386 from desktop/reorder-merge-commits-nope 2021-06-07 16:08:52 +02:00
tidy-dev 0fc29ecf6b Abort squash merge 2021-06-07 09:44:44 -04:00
Sergio Padrino af50695475 Make multi commit operation undo state nullable 2021-06-07 15:42:22 +02:00
Sergio Padrino 10f5596c99
Merge pull request #12384 from desktop/reorder-commits-flow 2021-06-07 15:31:49 +02:00
tidy-dev 253c4b13eb
Merge pull request #12387 from desktop/Fix-merge-choose-branch-closing-regression 
Fix Merge choose branch dialog closing on app focus return
 2021-06-07 09:02:34 -04:00
tidy-dev 938a846a1a Add menu entry for squash and merge 2021-06-07 08:05:48 -04:00
tidy-dev ec618e4e8f
Merge pull request #12381 from desktop/squash-merge-through-merge-modal-ui-wire-up 
Wire modal UI entry to squash and merge option
 2021-06-07 08:04:31 -04:00
tidy-dev 9f2021896b
Merge pull request #12380 from desktop/modify-merge-conflict-detecting-for-squash-option 
Modifying merge conflict detection/handling to support --squash
 2021-06-07 08:03:31 -04:00
tidy-dev a80db45ebd Update unit tests 2021-06-07 07:41:49 -04:00
tidy-dev 693de18b01 Fix Merge choose branch dialog closing on app focus return 2021-06-07 07:32:23 -04:00
Sergio Padrino 89a61b5c4e Don't allow reordering commits when there are merge commits involved 2021-06-07 13:22:11 +02:00
tidy-dev 69391b6eca Add conflict check from getStatus to the status result and use that 2021-06-07 07:19:12 -04:00
Sergio Padrino fcd9b0d46b Only show drag-related elements while dragging 2021-06-07 12:32:17 +02:00
Sergio Padrino 0a3e562e16 Enable (and fix) one test I forgot about 2021-06-07 11:33:18 +02:00
Sergio Padrino e831ccff46 Fix typo in error messages 2021-06-07 11:26:48 +02:00
Sergio Padrino ffa4566c6e Refactor method to process rebase result in multi-commit operations 2021-06-07 11:24:45 +02:00
Sergio Padrino ba7ba81dd9 Refactor "completeBlahBlah" methods 2021-06-07 11:15:34 +02:00
Sergio Padrino 89f1db63ce Enable reordering commits! 2021-06-07 10:44:20 +02:00
Sergio Padrino 66bcbd88d7
Merge pull request #12368 from desktop/Remove-last-of-old-merge 2021-06-07 09:07:34 +02:00
Sergio Padrino b35d98035b
Merge pull request #12369 from desktop/Adding---squash-option-to-merge-backend- 
Adding --squash option to merge to "backend"
 2021-06-07 08:48:13 +02:00
tidy-dev b0df26ee12 Wire UI entry to squash and merge option 2021-06-06 20:17:49 -04:00
tidy-dev e3c71ec4c0 Modifying merge conflict detection/handling to support --squash 2021-06-06 20:02:01 -04:00
tidy-dev f88482a81a Adding --squash option to merge 2021-06-04 15:03:26 -04:00
tidy-dev cadc38cc15 Remove remaining old merge logic 2021-06-04 14:57:20 -04:00
tidy-dev a156b3a679
Merge pull request #12362 from desktop/refactor-merge-to-multi-commit-operation 
Refactor merge to multi commit operation
 2021-06-04 12:25:21 -04:00