1 Commits (2902b3a68c95ddc9bfe9963031ae3454a5bb7d29)

Author	SHA1	Message	Date
Julian	4a685f8b87	Add rebase with merge commit merge style (#3844 An error occurred ) (#4052 An error occurred ) ... Signed-off-by: Julian Tölle <julian.toelle97@gmail.com>	6 years ago
Lauris BH	8ac1501ad7	Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188 An error occurred ) ... * Pull request options migration and UI in settings * Add ignore whitespace functionality * Fix settings if pull requests are disabled * Fix migration transaction * Merge with Rebase functionality * UI changes and related functionality for pull request merging button * Implement squash functionality * Fix rebase merging * Fix pull request merge tests * Add squash and rebase tests * Fix API method to reuse default message functions * Some refactoring and small fixes * Remove more hardcoded values from tests * Remove unneeded check from API method * Fix variable name and comment typo * Fix reset commit count after PR merge	7 years ago