bash: add '--merge' to 'git reset'
commite89e2ed7c225cf16cffbd9648895528e471e2fb8
authorSZEDER Gábor <szeder@ira.uka.de>
Mon, 29 Dec 2008 15:05:46 +0000 (29 16:05 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 5 Jan 2009 18:55:27 +0000 (5 10:55 -0800)
treea40086c37561b0218fdfd1196b920e268be92bff
parentea718e65fab17297a8a9dbebf63ae99096e9537a
bash: add '--merge' to 'git reset'

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
contrib/completion/git-completion.bash