| Fri, 10 Oct 2014 12:15:46 -0500 |
Matt Mackall |
merge with stable
|
| Wed, 08 Oct 2014 07:47:11 -0400 |
Jordi Gutiérrez Hermoso |
shelve: don't delete "." when rebase is a no-op (issue4398)
stable
|
| Thu, 31 Jul 2014 15:52:56 -0700 |
Pierre-Yves David |
revert: also track clean files
|
| Fri, 15 Aug 2014 10:47:03 -0500 |
Matt Mackall |
tests: fixup issue markers to make check-commit happy
|
| Sat, 26 Jul 2014 03:32:49 +0200 |
Pierre-Yves David |
resolve: add parenthesis around "no more unresolved files" message
stable
|
| Fri, 20 Jun 2014 16:15:38 +0900 |
FUJIWARA Katsunori |
shelve: accept '--edit' like other commands creating new changeset
|
| Thu, 05 Jun 2014 22:20:32 +0900 |
FUJIWARA Katsunori |
shelve: add option combination tests for refactoring in succeeding patch
|
| Mon, 26 May 2014 11:44:58 -0700 |
Pierre-Yves David |
merge: drop the quotes around commit description
|
| Fri, 23 May 2014 13:10:31 -0700 |
Siddharth Agarwal |
resolve: don't abort resolve -l even when no merge is in progress
|
| Thu, 08 May 2014 16:55:56 -0700 |
Durham Goode |
rebase: specify custom conflict marker labels for rebase (BC)
|
| Thu, 08 May 2014 16:50:22 -0700 |
Durham Goode |
merge: add conflict marker formatter (BC)
|
| Fri, 09 May 2014 14:46:50 -0500 |
Matt Mackall |
resolve: simplify "finished" message
|
| Fri, 18 Apr 2014 22:19:25 -0700 |
Gregory Szorc |
resolve: print message when no unresolved files remain (issue4214)
|
| Fri, 18 Apr 2014 19:08:32 -0700 |
Gregory Szorc |
resolve: abort when not applicable (BC)
|
| Mon, 07 Apr 2014 23:10:20 +0200 |
Mads Kiilerich |
tests: make unshelve tests more tricky - don't depend on size change
|
| Mon, 07 Apr 2014 23:10:20 +0200 |
Mads Kiilerich |
shelve: introduce secret option for using fixed date for temporary commit
|
| Mon, 10 Feb 2014 22:56:10 +0100 |
Simon Heimberg |
tests: rewrite path in test-shelve.t for not being mangled on msys
|
| Mon, 10 Feb 2014 00:54:40 +0100 |
Mads Kiilerich |
shelve: better (and slightly redundant) test coverage for unshelve conflicts
|
| Mon, 10 Feb 2014 00:54:27 +0100 |
Mads Kiilerich |
shelve: status messages from unshelve
|
| Mon, 10 Feb 2014 00:54:12 +0100 |
Mads Kiilerich |
shelve: be quiet when unshelve pulls from the shelve bundle
|
| Mon, 10 Feb 2014 00:53:27 +0100 |
Mads Kiilerich |
shelve: add 'changes to' prefix to default shelve message
|
| Tue, 26 Nov 2013 16:30:52 -0800 |
Durham Goode |
unshelve: add tests for unknown files
stable
|
| Thu, 07 Nov 2013 20:36:26 -0800 |
David Soria Parra |
shelve: unshelve using an unfiltered repository
stable
|
| Sun, 13 Oct 2013 08:38:30 -0400 |
Johan Bjork |
patch: ensure valid git diffs if source/destination file is missing (issue4046)
stable
|
| Tue, 29 Oct 2013 01:03:43 +0900 |
FUJIWARA Katsunori |
shelve: disallow commit while unshelve is in progress
stable
|
| Wed, 23 Oct 2013 13:12:48 -0700 |
Durham Goode |
shelve: use rebase instead of merge (issue4068)
stable
|
| Tue, 22 Oct 2013 12:41:05 +0900 |
Takumi IINO |
shelve: make unshelve work even if it don't run in repository root
stable
|
| Fri, 11 Oct 2013 17:19:40 -0700 |
Durham Goode |
shelve: fix dirstate corruption during unshelve (issue4055)
|
| Wed, 09 Oct 2013 14:15:20 -0700 |
Sean Farley |
shelve: only save mq state if enabled
|
| Thu, 03 Oct 2013 19:41:25 +0200 |
David Soria Parra |
shelve: copy bookmarks and restore them after a commit
|
| Thu, 29 Aug 2013 09:22:15 -0700 |
David Soria Parra |
shelve: allow shelving of a change with an mq patch applied
|
| Tue, 01 Oct 2013 12:20:31 +0200 |
David Soria Parra |
shelve: new output format for shelve listings
|
| Thu, 29 Aug 2013 09:22:13 -0700 |
David Soria Parra |
shelve: add a shelve extension to save/restore working changes
|
