![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Josef Weidendorfer <Josef.Weidendorfer@gmx.de> | |
| Sat, 9 Dec 2006 01:28:26 +0000 (02:28 +0100) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sat, 9 Dec 2006 02:13:31 +0000 (18:13 -0800) | ||
| commit | 62b339a544b1fa5199de7571c460d770cb286e65 | |
| tree | 6c82f20b50bacb40f8a55ac48ac2aac3cc27f2d2 | tree | snapshot |
| parent | 2cdf87ebd9976d98d544669d94b111fea731d2ba | commit | diff |
Add branch.*.merge warning and documentation update
This patch clarifies the meaning of the branch.*.merge option.
Previously, if branch.*.merge was specified but did not match any
ref, the message "No changes." was not really helpful regarding
the misconfiguration. This patch adds a warning for this.
Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This patch clarifies the meaning of the branch.*.merge option.
Previously, if branch.*.merge was specified but did not match any
ref, the message "No changes." was not really helpful regarding
the misconfiguration. This patch adds a warning for this.
Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| Documentation/config.txt | diff | blob | history | |
| git-parse-remote.sh | diff | blob | history |