| commit | b5f325cb4a0d986689177857a62007027a532d31 | |
| author | René Scharfe <l.s.r@web.de> | |
| Sat, 24 Sep 2016 11:30:22 +0000 (24 13:30 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 26 Sep 2016 14:15:28 +0000 (26 07:15 -0700) | ||
| tree | f15141910d7be6a63656a2fd06cea2351affa25c | treesnapshot (tar.gz zip) |
| parent | 4498b3a50a0e839788682f672df267cbc1ba9292 | commitdiff |
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>
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>
| lib/merge.tcl | diffblobblamehistory |