MirroredRepos/thefuck
1
0
Fork 0
mirror of https://github.com/nvbn/thefuck.git synced 2024-10-06 02:41:10 +01:00
Code Issues Releases Wiki Activity
1,563 Commits 2 Branches 83 Tags 13 MiB
365db1ee41
Commit Graph

2 Commits

Author SHA1 Message Date
Vladimir Iakovlev
5b3350b2dd #N/A: Fix tests with py.test 4 2018-11-21 19:43:01 +01:00
Joseph Frazier
027b41da59
Add git_merge_unrelated rule for git merge --allow-unrelated-histories (#773) 
From https://git-scm.com/docs/merge-options#merge-options---allow-unrelated-histories

> By default, `git merge` command refuses to merge histories that do not
share a common ancestor. This option can be used to override this safety
when merging histories of two projects that started their lives
independently.
 2018-01-16 20:03:56 -05:00