summaryrefslogtreecommitdiff
path: root/builtin-fetch.c
diff options
context:
space:
mode:
authorSZEDER Gábor <szeder@ira.uka.de>2008-12-29 16:05:46 +0100
committerJunio C Hamano <gitster@pobox.com>2009-01-05 10:55:27 -0800
commite89e2ed7c225cf16cffbd9648895528e471e2fb8 (patch)
treea40086c37561b0218fdfd1196b920e268be92bff /builtin-fetch.c
parentea718e65fab17297a8a9dbebf63ae99096e9537a (diff)
downloadgit-e89e2ed7c225cf16cffbd9648895528e471e2fb8.tar.gz
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>
Diffstat (limited to 'builtin-fetch.c')
0 files changed, 0 insertions, 0 deletions