| commit | 7612e61e33981f48f212f6aefe3550ac724d6208 | |
| author | Mårten Kongstad <marten.kongstad@gmail.com> | |
| Wed, 24 Apr 2013 20:49:06 +0000 (24 22:49 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 24 Apr 2013 23:05:07 +0000 (24 16:05 -0700) | ||
| tree | 2758c6dd061dfbfbb0b3de127735e7da65acd428 | treesnapshot (tar.gz zip) |
| parent | 2130bf3ca9a0ce6ea8bebaa5e3abbecb48b02c09 | commitdiff |
completion: remove duplicate block for "git commit -c"
Remove one of two consecutive, identical blocks for "git commit -c".
This was caused by a mechanical mismerge at d931e2fb252e (Merge
branch 'mp/complete-paths', 2013-02-08). The side branch wanted to
add this block at fea16b47 but the same fix was done independently
at 685397585 already.
Signed-off-by: Mårten Kongstad <marten.kongstad@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Remove one of two consecutive, identical blocks for "git commit -c".
This was caused by a mechanical mismerge at d931e2fb252e (Merge
branch 'mp/complete-paths', 2013-02-08). The side branch wanted to
add this block at fea16b47 but the same fix was done independently
at 685397585 already.
Signed-off-by: Mårten Kongstad <marten.kongstad@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| contrib/completion/git-completion.bash | diffblobblamehistory |