aboutsummaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJosef Weidendorfer <Josef.Weidendorfer@gmx.de>2006-12-19 01:39:07 +0100
committerJunio C Hamano <junkio@cox.net>2006-12-19 01:53:02 -0800
commit4363dfbe3d2f3fe3a4bd0fa7e9b22a14532c6cdb (patch)
tree9828125cc72c6fe06210c519bb2449c60d1d40f6 /merge-recursive.c
parentd4ebc36c5ee964592303c59260417b758d024c31 (diff)
downloadgit-4363dfbe3d2f3fe3a4bd0fa7e9b22a14532c6cdb.tar.gz
git-4363dfbe3d2f3fe3a4bd0fa7e9b22a14532c6cdb.tar.xz
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>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions