Felipe Contreras (5): branch: trivial style fix sha1-name: trivial style cleanup merge: simplify ff-only option t: replace pulls with merges pull: cleanup documentation Documentation/git-pull.txt | 4 ++-- builtin/branch.c | 3 +-- builtin/merge.c | 11 ++--------- sha1_name.c | 1 - t/annotate-tests.sh | 2 +- t/t4200-rerere.sh | 2 +- t/t9114-git-svn-dcommit-merge.sh | 2 +- t/t9500-gitweb-standalone-no-errors.sh | 2 +- 8 files changed, 9 insertions(+), 18 deletions(-) -- 1.8.4-fc -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html