Thread (28 messages) 28 messages, 11 authors, 2016-06-15

Re: [PATCH v3] Porcelain scripts: Rewrite cryptic "needs update" error message

flat view

From: Ævar Arnfjörð Bjarmason <hidden>
Date: 2016-06-15 22:50:33

On Tue, Oct 19, 2010 at 16:39, Ramkumar Ramachandra [off-list ref] wrote:
quoted hunk ↗ jump to hunk
-               git update-index --ignore-submodules --refresh &&
-               git diff-files --ignore-submodules --quiet &&
-               git diff-index --ignore-submodules --cached --quiet HEAD -- ||
-               die "refusing to pull with rebase: your working tree is not up-to-date"
+               require_clean_work_tree "pull with rebase" "Please commit or stash them."
Doing this sort of thing is basically incompatible with doing
i18n. I'll work around this when rebasing the ab/i18n series, but in
the long term we shouldn't be doing stuff like this.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help