summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-06-26 22:07:43 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-06-26 22:07:43 (GMT)
commit9a17e9ad15f77b739a33da703f695ad924cd825a (patch)
treef2709ce969ea4ee0b87cad88366a69f215f731b1
parenta036e4ebbf75e7f06fe88d8889f33b84ef5c8b4d (diff)
parent76b80cdf17807ba4a773562df2218980ffa27e4f (diff)
downloadgit-9a17e9ad15f77b739a33da703f695ad924cd825a.zip
git-9a17e9ad15f77b739a33da703f695ad924cd825a.tar.gz
git-9a17e9ad15f77b739a33da703f695ad924cd825a.tar.bz2
Merge branch 'mm/merge-in-dirty-worktree-doc'
* mm/merge-in-dirty-worktree-doc: Documentation/git-merge.txt: weaken warning about uncommited changes
-rw-r--r--Documentation/git-merge.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 67ca99c..8c7f2f6 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -56,8 +56,8 @@ especially if those changes were further modified after the merge
was started), 'git merge --abort' will in some cases be unable to
reconstruct the original (pre-merge) changes. Therefore:
-*Warning*: Running 'git merge' with uncommitted changes is
-discouraged: while possible, it leaves you in a state that is hard to
+*Warning*: Running 'git merge' with non-trivial uncommitted changes is
+discouraged: while possible, it may leave you in a state that is hard to
back out of in the case of a conflict.