projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d4ebc36) | patch
Move "no merge candidate" warning into git-pull
authorJosef Weidendorfer <Josef.Weidendorfer@gmx.de>
Tue, 19 Dec 2006 00:39:07 +0000 (01:39 +0100)
committerJunio C Hamano <junkio@cox.net>
Tue, 19 Dec 2006 09:53:02 +0000 (01:53 -0800)
commit4363dfbe3d2f3fe3a4bd0fa7e9b22a14532c6cdb
tree9828125cc72c6fe06210c519bb2449c60d1d40f6tree | snapshot
parentd4ebc36c5ee964592303c59260417b758d024c31commit | diff
Move "no merge candidate" warning into git-pull

The warning triggered even when running "git fetch" only
when resulting .git/FETCH_HEAD only contained
branches marked as 'not-for-merge'.

Signed-off-by: Josef Weidendorfer <weidendo@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
git-parse-remote.sh diff | blob | history
git-pull.sh diff | blob | history
Git—the stupid content tracker