diff options
| author |  René Scharfe <l.s.r@web.de> | 2016-09-24 13:30:22 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-09-26 07:15:28 -0700 |
| commit | b5f325cb4a0d986689177857a62007027a532d31 (patch) | |
| tree | f15141910d7be6a63656a2fd06cea2351affa25c /parse-options.c | |
| parent | git-gui: set version 0.20 (diff) | |
| download | tgif-b5f325cb4a0d986689177857a62007027a532d31.tar.xz | |
git-gui: stop using deprecated merge syntax
Starting with v2.5.0 git merge can handle FETCH_HEAD internally and
warns when it's called like 'git merge <message> HEAD <commit>' because
that syntax is deprecated. Use this feature in git-gui and get rid of
that warning.
Signed-off-by: Rene Scharfe <l.s.r@web.de>
Tested-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'parse-options.c')
0 files changed, 0 insertions, 0 deletions