| Wed, 10 Mar 2021 13:14:32 +0530 |
Pulkit Goyal |
commit: get info from mergestate whether a file was merged or not
|
file |
diff |
annotate
|
| Mon, 12 Oct 2020 12:44:18 -0700 |
Martin von Zweigbergk |
errors: introduce StateError and use it from commands and cmdutil
|
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, 23 Jul 2020 13:31:45 -0700 |
Kyle Lippincott |
morestatus: mention --stop even if not using --verbose
|
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, 13 Feb 2020 21:14:20 -0800 |
Martin von Zweigbergk |
debugmergestate: make templated
|
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, 16 Jul 2019 01:59:28 +0530 |
Taapas Agrawal |
continue: added support for rebase
|
file |
diff |
annotate
|
| Sun, 23 Jun 2019 23:11:35 +0530 |
Taapas Agrawal |
abort: added support for rebase
|
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
|
| Sat, 02 Jun 2018 13:44:44 -0400 |
Matt Harbison |
rebase: prioritize indicating an interrupted rebase over update (issue5838)
stable
|
file |
diff |
annotate
|
| Sat, 02 Jun 2018 13:25:45 -0400 |
Matt Harbison |
tests: demonstrate inconsistent messaging around interrupted rebases
stable
|
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
|
| Tue, 19 Sep 2017 22:06:26 -0700 |
Martin von Zweigbergk |
rebase: also include other namespaces in changeset description
|
file |
diff |
annotate
|
| Tue, 27 Jun 2017 17:40:24 +0200 |
Pierre-Yves David |
rebase: backed out changeset cf8ad0e6c0e4 (issue5610)
stable
|
file |
diff |
annotate
|
| Tue, 07 Mar 2017 16:27:32 -0800 |
Durham Goode |
rebase: move actual rebase into a single transaction
|
file |
diff |
annotate
|
| Sat, 19 Mar 2016 18:37:10 -0700 |
Simon Farnsworth |
merge: save merge part labels for later reuse
|
file |
diff |
annotate
|
| Sun, 07 Feb 2016 00:49:31 -0600 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Fri, 05 Feb 2016 10:22:14 -0800 |
Durham Goode |
merge: add file ancestor linknode to mergestate
|
file |
diff |
annotate
|
| Fri, 05 Feb 2016 01:56:46 +0000 |
timeless |
rebase: update working directory when aborting (issue5084)
stable
|
file |
diff |
annotate
|
| Thu, 04 Feb 2016 23:30:49 +0000 |
timeless |
tests: fix rebase-abort directory nesting
|
file |
diff |
annotate
|
| Wed, 18 Nov 2015 15:46:45 -0800 |
Siddharth Agarwal |
mergestate: handle additional record types specially
|
file |
diff |
annotate
|
| Tue, 13 Oct 2015 14:06:51 -0700 |
Christian Delahousse |
rebase: properly abort when destination is public (issue4896)
|
file |
diff |
annotate
|
| Fri, 09 Oct 2015 13:54:52 -0700 |
Siddharth Agarwal |
simplemerge: move conflict warning message to filemerge
|
file |
diff |
annotate
|
| Fri, 29 May 2015 22:23:58 +0200 |
Gilles Moris |
summary: move the parents phase marker to commit line (issue4688)
|
file |
diff |
annotate
|
| Thu, 14 May 2015 17:38:38 +0200 |
Gilles Moris |
summary: add a phase line (draft, secret) to the output
|
file |
diff |
annotate
|
| Sun, 10 May 2015 10:57:24 -0400 |
Jordi Gutiérrez Hermoso |
rebase: clear merge when aborting before any rebasing (issue4661)
stable
|
file |
diff |
annotate
|