diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-09-20 10:15:44 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-20 10:15:44 +0400 |
| commit | 34a5d35bbd6164cfbe08f5f14e359867ce80955b (patch) | |
| tree | 34021c00b8428d015583c7e9fffc5b8c1d37963e /contrib | |
| parent | 05e8b3d6f43bd28aef85ec6e7658536510d6f959 (diff) | |
| parent | cc185a6a8ac24737a26ec4b40cc401c2db8b2e97 (diff) | |
Merge branch 'maint'
* maint:
Start draft release notes for 1.6.0.3
git-repack uses --no-repack-object, not --no-repack-delta.
Typo "bogos" in format-patch error message.
builtin-clone: fix typo
Bust the ghost of long-defunct diffcore-pathspec.
completion: git commit should list --interactive
Conflicts:
RelNotes
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/completion/git-completion.bash | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index fccb499850..93f088189e 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -736,7 +736,7 @@ _git_commit () --*) __gitcomp " --all --author= --signoff --verify --no-verify - --edit --amend --include --only + --edit --amend --include --only --interactive " return esac |