git/builtin/commit.c, branch v2.14.2

Merge branch 'ks/commit-abort-on-empty-message-fix' into maint

2017-08-23T21:33:44Z

"git commit" when seeing an totally empty message said "you did not edit the message", which is clearly wrong. The message has been corrected. * ks/commit-abort-on-empty-message-fix: commit: check for empty message before the check for untouched template

commit: check for empty message before the check for untouched template

2017-07-17T22:10:41Z

The check for whether the template given to 'git commit' is untouched is done before the empty message check. This results in a wrong error message being displayed in the following case. When the user removes everything in template completely to abort the commit he is shown the "template untouched" error which is wrong. He should be shown the "empty message" error. Do the empty message check before checking for an untouched template thus fixing this issue. Signed-off-by: Kaartic Sivaraam Signed-off-by: Junio C Hamano

Merge branch 'ks/typofix-commit-c-comment'

2017-07-10T20:42:51Z

Typofix. * ks/typofix-commit-c-comment: builtin/commit.c: fix a typo in the comment

Merge branch 'ks/commit-assuming-only-warning-removal'

2017-07-10T20:42:50Z

An old message shown in the commit log template was removed, as it has outlived its usefulness. * ks/commit-assuming-only-warning-removal: commit-template: distinguish status information unconditionally commit-template: remove outdated notice about explicit paths

builtin/commit.c: fix a typo in the comment

2017-07-06T16:06:26Z

Signed-off-by: Kaartic Sivaraam Signed-off-by: Junio C Hamano

Merge branch 'ks/status-initial-commit'

2017-06-30T20:45:22Z

"git status" has long shown essentially the same message as "git commit"; the message it gives while preparing for the root commit, i.e. "Initial commit", was hard to understand for some new users. Now it says "No commits yet" to stress more on the current status (rather than the commit the user is preparing for, which is more in line with the focus of "git commit"). * ks/status-initial-commit: status: contextually notify user about an initial commit

commit-template: distinguish status information unconditionally

2017-06-30T14:50:21Z

The commit template adds the status information without adding a new line to distinguish them in the absence of optional parts. This results in difficulty in interpreting it's content, specifically for inexperienced users. Unconditionally, add new lines to separate the status message from the other parts of the commit-template to make it more readable. Signed-off-by: Kaartic Sivaraam Signed-off-by: Junio C Hamano

commit-template: remove outdated notice about explicit paths

2017-06-30T14:50:19Z

The notice that "git commit " default to "git commit --only " was there since 756e3ee0 ("Merge branch 'jc/commit'", 2006-02-14). Back then, existing users of Git expected the command doing "git commit --include ", and after the behaviour of the command was changed to align with other people's "$scm commit ", the text was added to help them transition their expectations. Remove the message that now has outlived its usefulness. Signed-off-by: Kaartic Sivaraam Signed-off-by: Junio C Hamano

Merge branch 'lb/status-stash-count'

2017-06-26T21:09:29Z

"git status" learned to optionally give how many stash entries the user has in its output. * lb/status-stash-count: glossary: define 'stash entry' status: add optional stash count information stash: update documentation to use 'stash entry'

Merge branch 'bw/config-h'

2017-06-24T21:28:41Z

Fix configuration codepath to pay proper attention to commondir that is used in multi-worktree situation, and isolate config API into its own header file. * bw/config-h: config: don't implicitly use gitdir or commondir config: respect commondir setup: teach discover_git_directory to respect the commondir config: don't include config.h by default config: remove git_config_iter config: create config.h