gitcli(5) already documents them, and there are no options named --no-no-stat, --no-no-summary and --no-no-log. Signed-off-by: Miklos Vajna <vmiklos@xxxxxxxxxxxxxx> --- On Mon, May 12, 2008 at 06:03:09PM +0200, Pierre Habouzit <madcoder@xxxxxxxxxx> wrote: > > I am wondering if our move should be to remove these negatives > > instead > > of adding more like the quoted patch does. > > We should removing the no-log and no-commit indeed as there are log > and > commit. the fact that --no-foo exists when --foo exists is documented > in > gitcli manpage. We can make it even better adding a flag if needed, > but > I feel it's not. Ok, here is an updated version that does this. git-merge.sh | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/git-merge.sh b/git-merge.sh index 69b35d8..5fc5f52 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -9,11 +9,9 @@ git-merge [options] <remote>... git-merge [options] <msg> HEAD <remote> -- stat show a diffstat at the end of the merge -n,no-stat don't show a diffstat at the end of the merge +n don't show a diffstat at the end of the merge summary (synonym to --stat) -no-summary (synonym to --no-stat) log add list of one-line log to merge commit message -no-log don't add list of one-line log to merge commit message squash create a single commit instead of doing a merge commit perform a commit if the merge sucesses (default) ff allow fast forward (default) -- 1.5.5.1.211.g65ea3.dirty -- 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
