From 7f6fe24280b0d351997e368d722e1612f62cb83f Mon Sep 17 00:00:00 2001 From: Tim Byrne Date: Fri, 27 Jan 2017 08:22:31 -0600 Subject: [PATCH] Indicate `stash` should be run from within `$HOME` --- yadm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/yadm b/yadm index 7cb033d..39d66cb 100755 --- a/yadm +++ b/yadm @@ -246,10 +246,12 @@ function clone() { This likely happened because you had files in \$HOME which conflicted with files tracked by origin/master. - You can review the stashed conflicts with the command - 'yadm stash show -p'. If you want to restore the stashed - data, you can run 'yadm stash apply' or 'yadm stash pop' - and then handle the conflicts in another way. + You can review the stashed conflicts with the + command 'yadm stash show -p' from within your + \$HOME directory. If you want to restore the + stashed data, you can run 'yadm stash apply' or + 'yadm stash pop' and then handle the conflicts + in another way. EOF else #; skip auto_bootstrap if conflicts could not be stashed