-
Suggestion
-
Resolution: Fixed
-
None
-
None
The merge button on pull request does "git merge -no-ff".
This is highly undesirable as it gives a bushy history line for no good reason.
As it is not configurable at the moment, at least it should simply call "git merge" which allow fast forwards.
Better yet merge behaviour and strategy should be configurable for the repository with the same default as "git merge" itself.
And/or even allow these options for each pull request merge.
With STASH-2810 and STASH-2753, this would make Pull Requests totally rocks.
- has a derivative of
-
BSERV-3092 Repository setting for turning off --no-ff on pull request merges
- Closed
- is related to
-
BSERV-2810 Option to squash commits when merging a pull request
- Closed
- was cloned as
-
BSERV-7134 Stash should expose the plugin.stash-scm-git.pullrequest.merge.strategy* setting in the UI
- Closed
[BSERV-2857] Pull Request should not force --no-ff flag
Workflow | Original: JAC Suggestion Workflow [ 3394117 ] | New: JAC Suggestion Workflow 3 [ 3615883 ] |
Status | Original: RESOLVED [ 5 ] | New: Closed [ 6 ] |
Workflow | Original: BSERV Suggestions Workflow [ 2685449 ] | New: JAC Suggestion Workflow [ 3394117 ] |
Workflow | Original: Stash Workflow [ 450838 ] | New: BSERV Suggestions Workflow [ 2685449 ] |
Status | Original: Closed [ 6 ] | New: Resolved [ 5 ] |
Link |
New:
This issue was cloned as |
Fix Version/s | Original: 2.1.0 [ 29717 ] | |
Affects Version/s | Original: 1.3.1 [ 28401 ] | |
Assignee | Original: Bryan Turner [ bturner ] | |
Issue Type | Original: Improvement [ 4 ] | New: Suggestion [ 10000 ] |
Priority | Original: Minor [ 4 ] |
Link |
New:
This issue has a derivative of |
Link |
Original:
This issue has a derivative of |
Link |
New:
This issue has a derivative of |
Fix Version/s | New: 2.1.0 [ 29717 ] |
Resolution | New: Fixed [ 1 ] | |
Status | Original: To be reviewed [ 10026 ] | New: Closed [ 6 ] |