| Wed, 12 Sep 2018 17:45:43 +0300 |
Pulkit Goyal |
context: don't count deleted files as candidates for path conflicts in IMM
|
| Wed, 12 Sep 2018 17:22:46 +0300 |
Pulkit Goyal |
rebase: add tests showing patch conflict detection needs to be smarter in IMM
|
| Fri, 17 Aug 2018 10:21:25 +0900 |
Yuya Nishihara |
rebase: do not pass in user option to rollback in-memory merge conflict
|
| Fri, 17 Aug 2018 10:19:17 +0900 |
Yuya Nishihara |
rebase: add test for in-memory merge conflicts
|
| Thu, 16 Aug 2018 16:59:40 +0300 |
Pulkit Goyal |
context: make sure file is not deleted while checking path conflicts
|
| Thu, 16 Aug 2018 16:53:48 +0300 |
Pulkit Goyal |
tests: demonstrate that IMM needs to be smarter with path conflicts
|
| Thu, 16 Aug 2018 16:36:32 +0300 |
Pulkit Goyal |
tests: don't create new repo inside existing repo in test-rebase-inmemory.t
|
| Wed, 15 Aug 2018 17:40:21 -0700 |
Kyle Lippincott |
overlayworkingctx: fix exception in metadata-only inmemory merges (issue5960)
|
| Sat, 14 Jul 2018 08:59:42 +0530 |
Sushil khanchi |
rebase: in --confirm option just abort if hit a conflict
|
| Thu, 12 Jul 2018 22:35:54 +0530 |
Sushil khanchi |
rebase: correct misleading message in --confirm option
|
| Sat, 30 Jun 2018 12:42:49 +0530 |
Sushil khanchi |
rebase: add --confirm option
|
| Fri, 29 Jun 2018 01:35:09 +0530 |
Sushil khanchi |
rebase: improve output of --dry-run
|
| Fri, 29 Jun 2018 01:05:08 +0530 |
Sushil khanchi |
rebase: suppress warning thrown when aborting rebase in case of dryrun
|
| Fri, 29 Jun 2018 00:47:33 +0530 |
Sushil khanchi |
rebase: no need to store backup in case of dryrun
|
| Sat, 23 Jun 2018 08:59:18 +0530 |
Sushil khanchi |
rebase: make dry-run return 1 or 0 according to result
|
| Sat, 16 Jun 2018 08:22:10 +0530 |
Sushil khanchi |
rebase: add dry-run functionality
|
| Thu, 15 Mar 2018 13:19:55 -0700 |
Martin von Zweigbergk |
rebase: allow in-memory merge of the working copy parent
|
| Mon, 11 Dec 2017 22:16:13 -0800 |
Phil Cohen |
rebase: replace --inmemory flag with rebase.experimental.inmemory config
|
| Sun, 10 Dec 2017 22:39:46 -0800 |
Phil Cohen |
tests: add a simple test for in-memory rebase
|
