| 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
|
| Tue, 27 Jun 2017 17:39:55 +0200 |
Pierre-Yves David |
rebase: backed out changeset 2519994d25ca
stable
|
file |
diff |
annotate
|
| Sun, 19 Mar 2017 11:54:15 -0700 |
Durham Goode |
rebase: use one dirstateguard for entire rebase
|
file |
diff |
annotate
|
| Sat, 19 Nov 2016 15:41:37 -0800 |
Kostia Balytskyi |
conflicts: make spacing consistent in conflict markers
|
file |
diff |
annotate
|
| Wed, 17 Feb 2016 22:45:01 +0100 |
liscju |
rebase: adds storing collapse message (issue4792)
|
file |
diff |
annotate
|
| Mon, 08 Feb 2016 14:03:45 +0100 |
Pierre-Yves David |
tests: add an explicit destination in some rebase tests
|
file |
diff |
annotate
|
| Mon, 19 Oct 2015 16:29:35 +0200 |
Mads Kiilerich |
rebase: fix wrong 'no changes to commit' when using --collapse
|
file |
diff |
annotate
|
| Fri, 22 May 2015 17:08:59 -0500 |
Matt Mackall |
branch: don't warn about branches if repository has multiple branches already
|
file |
diff |
annotate
|
| Fri, 09 Jan 2015 10:52:14 -0800 |
Durham Goode |
bundles: do not overwrite existing backup bundles (BC)
|
file |
diff |
annotate
|
| Wed, 10 Dec 2014 06:20:35 +0100 |
Mads Kiilerich |
rebase: show warning when rebase creates no changes to commit
|
file |
diff |
annotate
|
| Tue, 09 Dec 2014 03:45:26 +0100 |
Mads Kiilerich |
rebase: show more useful status information while rebasing
|
file |
diff |
annotate
|
| Sun, 07 Dec 2014 20:04:45 +0100 |
Mads Kiilerich |
tests: make 'saved backup' globbing less narrow in rebase tests
|
file |
diff |
annotate
|
| Fri, 10 Oct 2014 13:05:50 -0500 |
Matt Mackall |
dirstate: properly clean-up some more merge state on setparents
|
file |
diff |
annotate
|
| Fri, 15 Aug 2014 23:05:53 +0900 |
FUJIWARA Katsunori |
rebase: use "rebase.collapse" as "editform" for "--collapse" always
|
file |
diff |
annotate
|
| Sun, 02 Mar 2014 18:52:16 +0100 |
Mads Kiilerich |
merge: keep destination filename as key in filemerge actions
|
file |
diff |
annotate
|
| Wed, 19 Mar 2014 01:07:41 +0900 |
FUJIWARA Katsunori |
rebase: use "commitforceeditor" instead of "ui.edit()" for "--collapse"
stable
|
file |
diff |
annotate
|
| Mon, 16 Sep 2013 01:08:29 -0700 |
Brodie Rao |
branchmap: cache open/closed branch head information
|
file |
diff |
annotate
|
| Fri, 22 Nov 2013 19:14:17 +0100 |
Martin Geisler |
tests: don't load unnecessary graphlog extension
|
file |
diff |
annotate
|
| Fri, 01 Nov 2013 17:08:06 -0700 |
Durham Goode |
rebase: fix working copy location after a --collapse (issue4080)
stable
|
file |
diff |
annotate
|
| Wed, 23 Oct 2013 23:42:13 +0800 |
Mads Kiilerich |
rebase: improve error message for more than one external parent
stable
|
file |
diff |
annotate
|
| Mon, 14 Oct 2013 16:12:29 +0200 |
Pierre-Yves David |
rebase: preserve working directory parent (BC)
|
file |
diff |
annotate
|
| Mon, 14 Oct 2013 16:49:54 +0200 |
Pierre-Yves David |
tests: prepare rebase test for wc parent preservation
|
file |
diff |
annotate
|
| Fri, 15 Mar 2013 11:23:29 -0700 |
Durham Goode |
rebase: fix --collapse when a file was added then removed
|
file |
diff |
annotate
|
| Fri, 08 Feb 2013 22:54:17 +0100 |
Mads Kiilerich |
export: show 'Date' header in a format that also is readable for humans
|
file |
diff |
annotate
|
| Tue, 05 Feb 2013 16:22:53 -0800 |
Durham Goode |
bookmark: don't allow integers as bookmark/branch/tag names
|
file |
diff |
annotate
|
| Wed, 16 Jan 2013 00:09:26 +0100 |
Pierre-Yves David |
destroyed: drop complex branchcache rebuilt logic
|
file |
diff |
annotate
|
| Sun, 13 Jan 2013 01:39:16 -0600 |
Kevin Bullock |
filtering: rename filters to their antonyms
|
file |
diff |
annotate
|
| Mon, 07 Jan 2013 17:23:25 +0100 |
Pierre-Yves David |
branchmap: allow to use cache of subset
|
file |
diff |
annotate
|
| Fri, 22 Jun 2012 02:39:52 +0200 |
Mads Kiilerich |
tests: add missing 'backup bundle' path glob in test-rebase-collapse.t
|
file |
diff |
annotate
|
| Fri, 18 May 2012 12:45:47 -0700 |
Joshua Redstone |
strip: incrementally update the branchheads cache after a strip
|
file |
diff |
annotate
|
| Wed, 20 Jun 2012 20:08:57 +0200 |
Pierre-Yves David |
rebase: do not add second parent to rebased changeset (drop detach option) (BC)
|
file |
diff |
annotate
|