Re: [PATCH] Add branch.*.merge warning and documentation update

Score:

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

[view in full thread]

From: <sbejar@...>

To: Josef Weidendorfer <Josef.Weidendorfer@...>

Cc: Junio C Hamano <junkio@...>, <git@...>

Subject: Re: [PATCH] Add branch.*.merge warning and documentation update

Date: Saturday, December 9, 2006 - 12:14 pm

On 12/9/06, Josef Weidendorfer <Josef.Weidendorfer@gmx.de> wrote:
quoted text> 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>

Acked-by: Santi B

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:

git pull and merging., Aneesh Kumar, (Wed Dec 6, 12:51 am)

Re: git pull and merging., Junio C Hamano, (Wed Dec 6, 1:02 am)

Re: git pull and merging., Aneesh Kumar, (Wed Dec 6, 1:21 am)

Re: git pull and merging., Johannes Schindelin, (Wed Dec 6, 5:26 am)

Re: git pull and merging., Aneesh Kumar, (Wed Dec 6, 6:05 am)

Re: git pull and merging., Josef Weidendorfer, (Wed Dec 6, 12:44 pm)

Re: git pull and merging., Aneesh Kumar K.V, (Thu Dec 7, 2:46 am)

Re: git pull and merging., Josef Weidendorfer, (Thu Dec 7, 7:27 am)

Re: git pull and merging., Junio C Hamano, (Thu Dec 7, 3:06 pm)

Re: git pull and merging., Junio C Hamano, (Thu Dec 7, 7:06 pm)

Re: git pull and merging., , (Thu Dec 7, 10:04 pm)

Re: git pull and merging., Josef Weidendorfer, (Thu Dec 7, 6:54 pm)

Re: git pull and merging., Junio C Hamano, (Fri Dec 8, 3:07 am)

Re: git pull and merging., , (Thu Dec 7, 9:56 pm)

Re: git pull and merging., Josef Weidendorfer, (Fri Dec 8, 1:23 pm)

Re: git pull and merging., , (Fri Dec 8, 4:09 pm)

[PATCH] Add branch.*.localmerge and documentation update, Josef Weidendorfer, (Fri Dec 8, 3:12 pm)

Re: [PATCH] Add branch.*.localmerge and documentation update, , (Fri Dec 8, 4:52 pm)

Re: [PATCH] Add branch.*.localmerge and documentation update, Josef Weidendorfer, (Fri Dec 8, 5:39 pm)

Re: [PATCH] Add branch.*.localmerge and documentation update, , (Fri Dec 8, 6:15 pm)

Re: [PATCH] Add branch.*.localmerge and documentation update, Junio C Hamano, (Fri Dec 8, 5:38 pm)

Re: [PATCH] Add branch.*.localmerge and documentation update, Josef Weidendorfer, (Fri Dec 8, 6:01 pm)

Re: [PATCH] Add branch.*.localmerge and documentation update, Junio C Hamano, (Fri Dec 8, 6:34 pm)

Re: [PATCH] Add branch.*.localmerge and documentation update, Josef Weidendorfer, (Fri Dec 8, 7:17 pm)

Re: [PATCH] Add branch.*.localmerge and documentation update, Junio C Hamano, (Fri Dec 8, 7:41 pm)

[PATCH] Add branch.*.merge warning and documentation update, Josef Weidendorfer, (Fri Dec 8, 9:28 pm)

Re: [PATCH] Add branch.*.merge warning and documentation upd..., , (Sat Dec 9, 12:14 pm)


linux-kernel:
Mattia Dongili	Re: Linux 2.6.21-rc6
Greg Kroah-Hartman	[PATCH 024/196] mtd: Convert from class_device to device for MTD/mtdchar
Renato S. Yamane	Error -71 on device descriptor read/all
Chuck Ebbert	Why do so many machines need "noapic"?
git:
Mirko Stocker	Working with Git and CVS in a team.
Steffen Prohaska	Git-1.6.0.2-preview20080921 on Windows
Miles Bader	way to automatically add untracked files?
Tilman Sauerbeck	[BUG?] git log picks up bad commit
openbsd-misc:
Brian A. Seklecki	sshd_config(5) PermitRootLogin yes
Jacob Yocom-Piatt	Re: Real men don't attack straw men
Parvinder Bhasin	BIND and CNAME-ing
Jerome Santos	sshd.config and AllowUsers
linux-netdev:
Patrick McHardy	pkt_sched: add DRR scheduler
ackman	RTL8169 driver no longer functioning with 8111b
Evgeniy Polyakov	[resend take 2 4/4] DST Makefile/Kconfig files.
Sami Farin	Linux 2.6.27.5 / SFQ/HTB scheduling problems


Kernel Panic when schedule is called	1 hour ago	Linux kernel
VPN's on NetBSD	14 hours ago	NetBSD
Why does uClinux 2.6.18 bootup block SuperIO UART IRQs that BIOS configured	15 hours ago	Linux kernel
USB statistics	17 hours ago	Linux kernel
Block Sub System query	21 hours ago	Linux kernel
kernel module to intercept socket creation	22 hours ago	Linux kernel
Image size changing during each build	22 hours ago	Linux kernel
Soft lock bug	1 day ago	Linux kernel
sysctl - dynamic registration problem	1 day ago	Linux kernel
Question on swap as ramdisk partition	1 day ago	Linux kernel

Re: [PATCH] Add branch.*.merge warning and documentation update

Online users