[PATCH] mergetool: don't suggest to continue after last file

This eliminates an unnecessary prompt to continue after failed merger. The patch uses positional parameters to count files in the list. If only one iteration is remained, the prompt_after_failed_merge function is not called. Signed-off-by: Nicholas Guriev --- git-mergetool.sh | 8 +--- 1

[PATCH v2] status: -i shorthand for --ignored command line option

It allows for uniformity with the --untracked-files option. Also the new short flag saves the number of keys to press for the typically git-status command. Signed-off-by: Nicholas Guriev --- Documentation/git-status.txt | 1 + builtin/commit.c | 2 +- 2 files changed, 2 insertions

[PATCH] status: -i shorthand for --ignored command line option

This short option saves the number of keys to press for the typically git-status command. --- I already sent the patch here, but it doesn't seem reached to the list. So I send the email (now with DKIM) again and apologize if you get this twice. builtin/commit.c | 2 +- 1 file changed, 1 insertion