Merge branch 'mg/maint-doc-sparse-checkout'

* mg/maint-doc-sparse-checkout: git-read-tree.txt: correct sparse-checkout and skip-worktree description git-read-tree.txt: language and typography fixes unpack-trees: print "Aborting" to stderr
2011-10-05 12:36:25 -07:00
parent 7a95d1be03 1f1f575ebe
commit 5fbef463a1
4 changed files with 31 additions and 25 deletions
--- a/unpack-trees.c
+++ b/unpack-trees.c
@ -159,7 +159,7 @@ static void display_error_msgs(struct unpack_trees_options *o)
 		string_list_clear(rejects, 0);
 	}
 	if (something_displayed)
-		printf("Aborting\n");
+		fprintf(stderr, "Aborting\n");
 }

 /*