Released git version 1.5.3.4 yinping@kooxoo235:~/git$ git-pull --ff Usage: /usr/local/bin/git-fetch <fetch-options> <repository> <refspec>... yinping@kooxoo235:~/git$ git-pull --no-ff Usage: /usr/local/bin/git-fetch <fetch-options> <repository> <refspec>... yinping@kooxoo235:~/git$ git-merge --ff origin/master Usage: /usr/local/bin/git-merge [-n] [--summary] [--no-commit] [--squash] [-s <strategy>] [-m=<merge-message>] <commit>+ yinping@kooxoo235:~/git$ git-merge --no-ff origin/master Usage: /usr/local/bin/git-merge [-n] [--summary] [--no-commit] [--squash] [-s <strategy>] [-m=<merge-message>] <commit>+ -- franky - 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
