Commit Graph

1065 Commits (c84e82fce8dcd404cb99a3473fd1fdad1fd2aa16)

Author SHA1 Message Date
Junio C Hamano c84e82fce8 Meta/Announce: rc0 is an early preview 2012-10-07 14:50:03 -07:00
Junio C Hamano a322462556 What's cooking (2012/10 #02) 2012-10-04 21:46:15 -07:00
Junio C Hamano d6f2734478 What's cooking (2012/10 #01) 2012-10-02 16:14:02 -07:00
Junio C Hamano 95649dee40 What's cooking (2012/09 #10) 2012-09-30 21:33:28 -07:00
Junio C Hamano 9af984e276 What's cooking (2012/09 #09) 2012-09-27 18:23:47 -07:00
Junio C Hamano 0c49ca3332 Meta/post-applypatch: use bidirectional notes mapping in amlog 2012-09-27 18:22:55 -07:00
Junio C Hamano 4781a1f7de Meta/GRADUATED: a branch may not be describable 2012-09-27 18:19:48 -07:00
Junio C Hamano d20819096c What's cooking (2012/09 #08) 2012-09-24 14:27:33 -07:00
Junio C Hamano 85a4700cc2 What's cooking (2012/09 #07) 2012-09-21 12:46:38 -07:00
Junio C Hamano 582bbad46a Meta/MaintNotes update post 1.7.12.1 2012-09-18 16:03:57 -07:00
Junio C Hamano c9b808781b What's cooking (2012/09 #06) 2012-09-17 17:43:41 -07:00
Junio C Hamano 9ec05bb8e3 What's cooking (2012/09 #05) 2012-09-14 14:19:17 -07:00
Junio C Hamano 29d334511a Meta/cook: format the topic description with indentation
This _might_ make things easier to read, together with an extra
blank line between each topic.

Adjust Meta/Reintegrate to read and strip the extra indentation to
avoid breaking the merge log messages.  "Meta/cook -w" also has
been adjusted to read and strip the extra indentation before finding
the markers for "will-do".
2012-09-13 21:40:02 -07:00
Junio C Hamano 4304d883d9 Meta/GRADUATED: sort the branches based on their origin
The list of branches that have been merged is easier to read if the
topics based on similar vintage of the base revisions are grouped
together.
2012-09-11 16:19:31 -07:00
Junio C Hamano a2e12fcc8e What's cooking (2012/09 #04) 2012-09-11 13:21:32 -07:00
Junio C Hamano 15663e26ba What's cooking (2012/09 #03) 2012-09-10 16:52:51 -07:00
Junio C Hamano 75ea0daf69 What's cooking (2012/09 #02) 2012-09-07 14:54:46 -07:00
Junio C Hamano e911aec440 What's cooking (2012/09 #01) 2012-09-04 16:15:55 -07:00
Junio C Hamano 6d5fa44666 What's cooking (2012/08 #10) 2012-08-31 14:19:09 -07:00
Junio C Hamano 40c2133686 Meta/Dothem: use the same GIT-CFLAGS when building and installing 2012-08-31 14:18:49 -07:00
Junio C Hamano 69cd2dbff4 What's cooking (2012/08 #09) 2012-08-29 15:58:38 -07:00
Junio C Hamano 29acbf5cc2 What's cooking (2012/08 #08) 2012-08-27 18:51:59 -07:00
Junio C Hamano d42ae9cb87 What's cooking (2012/08 #07) 2012-08-22 14:02:05 -07:00
Junio C Hamano 8714ff61d0 What's cooking (2012/08 #06) 2012-08-21 16:05:40 -07:00
Junio C Hamano 6dea48b707 What's cooking (2012/08 #06) 2012-08-19 23:47:46 -07:00
Junio C Hamano 5214548303 Update MaintNotes (post 1.7.12) 2012-08-19 20:15:33 -07:00
Junio C Hamano 48a56d0d4e What's cooking (2012/08 #05) 2012-08-18 23:42:36 -07:00
Junio C Hamano 6010bae1a9 What's cooking (2012/08 #04) 2012-08-14 14:57:11 -07:00
Junio C Hamano dbd9f19762 Meta/cook: give a copy to lwn.net 2012-08-14 14:56:15 -07:00
Junio C Hamano 9de326a435 What's cooking (2012/08 #03) 2012-08-13 00:52:51 -07:00
Junio C Hamano c782f38f13 What's cooking (2012/08 #02) 2012-08-06 13:26:59 -07:00
Junio C Hamano b3d7ceac87 What's cooking (2012/08 #01) 2012-08-02 15:43:31 -07:00
Junio C Hamano 278423a199 What's cooking (2012/07 #10) 2012-07-30 14:33:34 -07:00
Junio C Hamano b0e3893792 What's cooking (2012/07 #09) 2012-07-29 20:06:19 -07:00
Junio C Hamano 98c759ddd0 What's cooking (2012/07 #08) 2012-07-26 22:47:00 -07:00
Junio C Hamano 4058b834e7 What's cooking (2012/07 #07) 2012-07-23 22:09:55 -07:00
Junio C Hamano 1901a58e9f What's cooking (2012/07 #06) 2012-07-22 13:42:27 -07:00
Junio C Hamano ad241d9861 Meta/Reintegrate: force invoking the editor when merging
As "git merge" is clever not to default to --edit behaviour when its
standard input and output streams are not connected to the same
terminal (i.e. indicating an interactive tty session), we would need
to explicitly ask for "--edit" while exporting "EDITOR=:" one-shot,
so that commit log cleaner still is triggered.

In the longer term, the interactions among pull, fmt-merge-msg,
merge and the editor need to be redesigned, but it is a large task,
so for now this workaround should suffice.
2012-07-16 16:06:27 -07:00
Junio C Hamano 0b30d5504a What's cooking (2012/07 #05) 2012-07-15 22:32:41 -07:00
Junio C Hamano f913e9982d What's cooking (2012/07 #04) 2012-07-13 16:33:43 -07:00
Junio C Hamano dbf298f6ff What's cooking (2012/07 #03) 2012-07-11 15:12:54 -07:00
Junio C Hamano 28cd4f629a What's cooking (2012/07 #02) 2012-07-09 13:12:11 -07:00
Junio C Hamano f479eb6714 Meta/cook --havedone to help updating RelNotes 2012-07-09 11:11:36 -07:00
Junio C Hamano 82f5aa1676 What's cooking (2012/07 #01) 2012-07-03 16:16:09 -07:00
Junio C Hamano bc1ab8649a What's cooking (2012/06 #08) 2012-06-28 16:32:00 -07:00
Junio C Hamano a5873c4d69 Meta/Reintegrate: work around minor --no-edit breakage
For --no-edit to be true replacement of one-shot export of EDITOR=:,
it should trigger stripspace() to remove comments, but currently it
doesn't.  Avoid using it for now.
2012-06-27 21:17:09 -07:00
Junio C Hamano 7c519cf70b What's cooking (2012/06 #07) 2012-06-25 13:07:35 -07:00
Junio C Hamano c36e19f6cf What's cooking (2012/06 #06) 2012-06-21 15:52:18 -07:00
Junio C Hamano 90d1b3f183 Meta/MaintNotes: post 1.7.11 update 2012-06-21 14:19:01 -07:00
Junio C Hamano 9c67e8da79 What's cooking (2012/06 #05) 2012-06-19 16:39:34 -07:00