| Tue, 18 Jan 2022 14:57:15 -0800 |
Martin von Zweigbergk |
rebase: set custom conflict label for base commit
|
file |
diff |
annotate
|
| Thu, 20 Jan 2022 14:13:12 -0800 |
Martin von Zweigbergk |
filemerge: always define a "base" label
|
file |
diff |
annotate
|
| Tue, 04 May 2021 10:49:32 -0700 |
Martin von Zweigbergk |
rewriteutil: say how many commits would become orphan if commit is rewritten
|
file |
diff |
annotate
|
| Thu, 11 Feb 2021 15:11:10 -0800 |
Martin von Zweigbergk |
rewriteutil: point to help about instability when rewriting creates orphan
|
file |
diff |
annotate
|
| Fri, 29 Jan 2021 16:33:12 -0800 |
Martin von Zweigbergk |
errors: use more specific errors in rebase extension
|
file |
diff |
annotate
|
| Thu, 22 Oct 2020 14:14:59 -0700 |
Martin von Zweigbergk |
errors: introduce CanceledError and use it in a few places
|
file |
diff |
annotate
|
| Mon, 16 Nov 2020 15:11:51 -0800 |
Martin von Zweigbergk |
errors: raise more specific errors from rewriteutil
|
file |
diff |
annotate
|
| Wed, 21 Oct 2020 19:00:16 -0700 |
Martin von Zweigbergk |
errors: add config that lets user get more detailed exit codes
|
file |
diff |
annotate
|
| Thu, 29 Oct 2020 09:03:08 -0700 |
Martin von Zweigbergk |
templates: include all non-branch namespaces in default one-line summary
|
file |
diff |
annotate
|
| Tue, 27 Oct 2020 15:33:15 -0700 |
Martin von Zweigbergk |
rebase: change and standarize template for rebase's one-line summary
|
file |
diff |
annotate
|
| Thu, 10 Sep 2020 13:12:34 -0700 |
Martin von Zweigbergk |
graphlog: use '%' only if there are *unresolved* conflicts
|
file |
diff |
annotate
|
| Mon, 13 Jul 2020 16:42:44 -0700 |
Daniel Ploch |
error: unify the error message formats for 'rebase' and 'unshelve'
|
file |
diff |
annotate
|
| Thu, 12 Mar 2020 14:50:00 -0700 |
Martin von Zweigbergk |
tests: fix rebase test broken by earlier cleanup
|
file |
diff |
annotate
|
| Fri, 10 Jan 2020 14:22:20 -0800 |
Martin von Zweigbergk |
rebase: don't use rebased node as dirstate p2 (BC)
|
file |
diff |
annotate
|
| Tue, 28 Jan 2020 21:49:50 -0800 |
Martin von Zweigbergk |
graphlog: use '%' for other context in merge conflict
|
file |
diff |
annotate
|
| Tue, 21 Jan 2020 15:45:06 -0800 |
Martin von Zweigbergk |
tests: move non-collapse test out of test-rebase-collapse
|
file |
diff |
annotate
|
| Mon, 13 Jan 2020 11:18:29 -0800 |
Martin von Zweigbergk |
rebase: fix bug where `--collapse` would apply diff on missing file
|
file |
diff |
annotate
|
| Wed, 18 Dec 2019 09:18:02 +0300 |
Martin von Zweigbergk |
rebase: use rewriteutil.precheck() instead of reimplementing it
|
file |
diff |
annotate
|
| Thu, 10 Jan 2019 15:42:13 +0100 |
Boris Feld |
test: explicit a rebase source in test-rebase-collapse.t
|
file |
diff |
annotate
|
| Fri, 07 Dec 2018 14:23:17 -0800 |
Martin von Zweigbergk |
rebase: clarify that commits that become empty are skipped
|
file |
diff |
annotate
|
| Fri, 07 Dec 2018 14:17:09 -0800 |
Martin von Zweigbergk |
rebase: format commit in usual way when explaining that it became empty
|
file |
diff |
annotate
|
| Thu, 30 Aug 2018 01:53:21 +0200 |
Boris Feld |
phase: report number of non-public changeset alongside the new range
|
file |
diff |
annotate
|
| Wed, 21 Mar 2018 11:01:19 -0700 |
Martin von Zweigbergk |
rebase: store rebase state after each commit
|
file |
diff |
annotate
|
| Sun, 18 Mar 2018 22:26:23 -0700 |
Martin von Zweigbergk |
tests: add some more tests to test-rebase-collapse.t
|
file |
diff |
annotate
|
| Sun, 18 Mar 2018 15:25:23 -0700 |
Martin von Zweigbergk |
tests: use drawdag in test-rebase-collapse.t
|
file |
diff |
annotate
|
| Sun, 10 Dec 2017 22:50:57 -0500 |
Matt Harbison |
tests: remove (glob) annotations that were only for '\' matches
|
file |
diff |
annotate
|
| Sun, 10 Dec 2017 21:57:37 -0800 |
Phil Cohen |
tests: add commit hashes to log commands in rebase tests
|
file |
diff |
annotate
|
| Thu, 12 Oct 2017 09:39:50 +0200 |
Denis Laxalde |
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
|
file |
diff |
annotate
|
| Tue, 19 Sep 2017 22:06:26 -0700 |
Martin von Zweigbergk |
rebase: also include other namespaces in changeset description
|
file |
diff |
annotate
|
| Fri, 07 Jul 2017 18:51:46 -0700 |
Jun Wu |
rebase: use scmutil.cleanupnodes (issue5606) (BC)
|
file |
diff |
annotate
|