| commit | 074b16b106c114d0854e7486056c0c89fcf16e49 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 29 Mar 2012 06:47:10 +0000 (28 23:47 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 29 Mar 2012 06:47:10 +0000 (28 23:47 -0700) | ||
| tree | a261748b2b971e3d6cf5d04be909ea748f73d02a | treesnapshot (tar.gz zip) |
| parent | 62764ae8654b1009e5466ef9fd7f55dbd6de92e9 | commitdiff |
| parent | 5293b54a218cc9ec7c667f64d4b10cd0d985203f | commitdiff |
Merge branch 'mm/push-default-switch-warning' into next
This resurrects an ancient patch I wrote during a discussion we had in the
1.6.3-1.6.4 era. This should probably come after ct/advise-push-default
topic and at that point the advise messages need to be rephrased, taking
the future default change into account.
* mm/push-default-switch-warning:
push: start warning upcoming default change for push.default
Conflicts:
builtin/push.c
This resurrects an ancient patch I wrote during a discussion we had in the
1.6.3-1.6.4 era. This should probably come after ct/advise-push-default
topic and at that point the advise messages need to be rephrased, taking
the future default change into account.
* mm/push-default-switch-warning:
push: start warning upcoming default change for push.default
Conflicts:
builtin/push.c
| builtin/push.c | diff1 | diff2 | blobhistory |