git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4498b3a)
git-gui: stop using deprecated merge syntax
authorRené Scharfe <redacted>
Sat, 24 Sep 2016 11:30:22 +0000 (13:30 +0200)
committerJunio C Hamano <redacted>
Mon, 26 Sep 2016 14:15:28 +0000 (07:15 -0700)
commitb5f325cb4a0d986689177857a62007027a532d31
treef15141910d7be6a63656a2fd06cea2351affa25ctree | snapshot
parent4498b3a50a0e839788682f672df267cbc1ba9292commit | diff
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 <redacted>
Tested-by: Johannes Sixt <redacted>
Signed-off-by: Junio C Hamano <redacted>
lib/merge.tcl diff | blob | history
git clone https://git.99rst.org/PROJECT