Re: [PATCH 1/2] pull: respect rebase.autostash

From: Ramkumar Ramachandra <artagnon@gmail.com>
Date: Jun 14, 2013, 10:41 UTC
Message-ID: <CALkWK0n4QXsRNQxiSfeoPRdwp6kva8V08oG0h9Ld7TpBTgKDKA@mail.gmail.com>
In-Reply-To: <vpqfvwlkqb5.fsf@anie.imag.fr>

Matthieu Moy wrote:

> It would be nice to have an --autostash command-line option too,

I thought it would be a bit ugly, since it's already overloaded with options to pass to merge.

> and the
> error message in "require_clean_work_tree" could suggest using it. That
> would make the feature easily discoverable.

Cannot pull with rebase: You have unstaged changes. Please commit or stash them. See also: rebase.autostash in git-config(1).

> Perhaps this patch could mention "pull --rebase" in the doc, like (config.txt)

--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -112,5 +112,6 @@ include::merge-options.txt[]
 See `pull.rebase`, `branch.<name>.rebase` and `branch.autosetuprebase` in
 linkgit:git-config[1] if you want to make `git pull` always use
-`--rebase` instead of merging.
+`--rebase` instead of merging.  See `rebase.autostash` in
+linkgit:git-config[1] if you want to be able to run on a dirty worktree.
 +

Thanks.