Junio C Hamano [Wed, 4 Mar 2009 19:40:07 +0000 (11:40 -0800)]
Remove bunch of stale issues - the list is unmaintained these days
Junio C Hamano [Wed, 4 Mar 2009 19:39:04 +0000 (11:39 -0800)]
Remove emacsorg-mode list; it seems to be moderated
Junio C Hamano [Tue, 3 Mar 2009 09:08:00 +0000 (01:08 -0800)]
Leftover what's cooking
Junio C Hamano [Tue, 3 Mar 2009 09:06:58 +0000 (01:06 -0800)]
What's in
Junio C Hamano [Tue, 3 Mar 2009 09:01:05 +0000 (01:01 -0800)]
What's in
Junio C Hamano [Tue, 17 Feb 2009 07:55:40 +0000 (23:55 -0800)]
What's cooking
Junio C Hamano [Tue, 17 Feb 2009 07:52:17 +0000 (23:52 -0800)]
Update Announce for release candidates and use ProjectContact
Junio C Hamano [Tue, 17 Feb 2009 07:52:02 +0000 (23:52 -0800)]
Add ProjectContact script
Junio C Hamano [Sun, 15 Feb 2009 10:44:31 +0000 (02:44 -0800)]
What's in
Junio C Hamano [Sun, 15 Feb 2009 10:20:22 +0000 (02:20 -0800)]
What's cooking
Junio C Hamano [Sat, 14 Feb 2009 00:56:28 +0000 (16:56 -0800)]
Reintegrate: sometimes a specific cherry-pick need to be carried forward
This is especially necessary when you reverted a premature merge
to more stable integration branch while you do want to keep the
topic cooking in more experimental integration branch.
Junio C Hamano [Thu, 12 Feb 2009 04:01:31 +0000 (20:01 -0800)]
What's in
Junio C Hamano [Sat, 7 Feb 2009 21:23:07 +0000 (13:23 -0800)]
What's cooking as of 1.6.2-rc0
Junio C Hamano [Thu, 5 Feb 2009 01:33:08 +0000 (17:33 -0800)]
What's cooking
Junio C Hamano [Mon, 2 Feb 2009 08:04:15 +0000 (00:04 -0800)]
What's in update
Junio C Hamano [Mon, 2 Feb 2009 07:39:21 +0000 (23:39 -0800)]
What's cooking update
Junio C Hamano [Thu, 29 Jan 2009 07:52:52 +0000 (23:52 -0800)]
Add Meta/GRADUATED
Junio C Hamano [Thu, 29 Jan 2009 02:01:57 +0000 (18:01 -0800)]
What's in/cooking
Junio C Hamano [Mon, 26 Jan 2009 08:48:46 +0000 (00:48 -0800)]
Add Meta/Reintegrate
In a workflow that uses topic branches heavily, you would need to keep
updating test integration branch(es) all the time. If they are managed
like my 'next' by merging the tips of topics that have grown since the
last integration, it is not so difficult. You only need to review output
from "git branch --no-merged next" to see if there are topics that can and
needs to be merged to 'next'.
But sometimes it is easier to rebuild a test integration branch from
scratch all the time, especially if you do not publish it for others to
build on.
I've been using this script for some time to rebuild jch and pu branches
in my workflow. jch's tip is supposed to always match 'next', but it is
rebuilt from scratch on top of 'master' by merging the same topics that
are in 'next'. You can use the same script in your work.
To use it, you give a commit range base..tip to the script, and you will
see a shell script that uses a series of 'git-merge'. "base" is the more
stable branch that you rebuild your test integration branch on top (in my
case, 'master'), and "tip" is where the tip of the test integration branch
is from the last round (in my case, 'jch' or 'pu').
Then you can run the resulting script, fix conflicted merge and use
'git-commit', and then repeat until all the branches are re-integrated on
top of the base branch.
$ Meta/Reintegrate master..jch >/var/tmp/redo-jch.sh
$ cat /var/tmp/redo-jch.sh
#!/bin/sh
while read branch eh
do
case "$eh" in
"") git merge "$branch" || break ;;
?*) echo >&2 "Eh? $branch $eh"; break ;;
esac
done <<EOF
jc/blame
js/notes
ks/maint-mailinfo-folded~3
tr/previous-branch
EOF
$ git checkout jch
$ git reset --hard master
$ /var/tmp/redo-jch.sh
... if there is conflict, resolve, "git commit" here ...
$ /var/tmp/redo-jch.sh
... repeat until everything is applied.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Sun, 25 Jan 2009 04:37:50 +0000 (20:37 -0800)]
What's in/cooking updates
Junio C Hamano [Fri, 23 Jan 2009 18:47:53 +0000 (10:47 -0800)]
Summary: use reflog
Junio C Hamano [Fri, 23 Jan 2009 18:47:39 +0000 (10:47 -0800)]
Doit: add -noinstall
Junio C Hamano [Fri, 23 Jan 2009 18:37:14 +0000 (10:37 -0800)]
V: pay attention to dirty versions
Junio C Hamano [Fri, 23 Jan 2009 18:36:53 +0000 (10:36 -0800)]
Doit: allow private editions
Junio C Hamano [Fri, 23 Jan 2009 18:36:31 +0000 (10:36 -0800)]
Make: threaded-delta-search should be safe by now
Junio C Hamano [Fri, 23 Jan 2009 18:39:44 +0000 (10:39 -0800)]
SE: no suppress-cc; use configuration
Junio C Hamano [Thu, 22 Jan 2009 03:39:02 +0000 (19:39 -0800)]
What's cooking updates
Junio C Hamano [Mon, 19 Jan 2009 09:12:41 +0000 (01:12 -0800)]
What's cooking
Junio C Hamano [Mon, 19 Jan 2009 08:57:44 +0000 (00:57 -0800)]
What's in
Junio C Hamano [Wed, 14 Jan 2009 08:12:04 +0000 (00:12 -0800)]
What's in/cooking updates
Junio C Hamano [Sun, 11 Jan 2009 09:50:15 +0000 (01:50 -0800)]
What's cooking issue #2 of Jan'09
Junio C Hamano [Tue, 6 Jan 2009 05:45:07 +0000 (21:45 -0800)]
What's cooking 2009-01 issue #1
Junio C Hamano [Tue, 6 Jan 2009 05:21:58 +0000 (21:21 -0800)]
Last issue of What's in/cooking for 2008
Junio C Hamano [Thu, 25 Dec 2008 06:39:40 +0000 (22:39 -0800)]
Post 1.6.1 updates
Junio C Hamano [Sun, 21 Dec 2008 12:16:55 +0000 (04:16 -0800)]
What's in/cooking
Junio C Hamano [Sun, 14 Dec 2008 08:20:03 +0000 (00:20 -0800)]
What's in/cooking
Junio C Hamano [Wed, 3 Dec 2008 06:55:44 +0000 (22:55 -0800)]
What's in/cooking updates
Junio C Hamano [Wed, 3 Dec 2008 06:55:26 +0000 (22:55 -0800)]
What's in/cooking updates
Junio C Hamano [Sat, 15 Nov 2008 22:11:49 +0000 (14:11 -0800)]
What's in/cooking
Junio C Hamano [Thu, 13 Nov 2008 02:00:32 +0000 (18:00 -0800)]
What's in/cooking
Junio C Hamano [Sun, 9 Nov 2008 22:56:18 +0000 (14:56 -0800)]
What's cooking #3 of Nov 2008
Junio C Hamano [Sun, 9 Nov 2008 18:58:13 +0000 (10:58 -0800)]
Typofix: what's cooking 2008-11 #02
Junio C Hamano [Thu, 6 Nov 2008 01:04:36 +0000 (17:04 -0800)]
What's cooking 2nd issue of Nov 2008
Junio C Hamano [Thu, 6 Nov 2008 01:04:17 +0000 (17:04 -0800)]
Replace logo in maintnotes html version
Junio C Hamano [Thu, 6 Nov 2008 01:03:43 +0000 (17:03 -0800)]
WIP: slight updates to What's cooking script
Junio C Hamano [Thu, 6 Nov 2008 01:02:48 +0000 (17:02 -0800)]
TODO: purge old items
Junio C Hamano [Thu, 6 Nov 2008 01:02:24 +0000 (17:02 -0800)]
Doit: optionally test with /bin/dash
Junio C Hamano [Sun, 2 Nov 2008 21:30:49 +0000 (13:30 -0800)]
What's in/cooking - the first issue in November 08
Junio C Hamano [Thu, 23 Oct 2008 05:37:35 +0000 (22:37 -0700)]
What's in/cooking
Junio C Hamano [Sat, 18 Oct 2008 18:36:40 +0000 (11:36 -0700)]
What's in/cooking
Junio C Hamano [Tue, 14 Oct 2008 07:21:31 +0000 (00:21 -0700)]
What's in/cooking updates
Shawn O. Pearce [Sun, 12 Oct 2008 21:24:19 +0000 (14:24 -0700)]
What's in and cooking 2008-10 #02
Shawn O. Pearce [Mon, 6 Oct 2008 16:57:41 +0000 (09:57 -0700)]
What's in and cooking 2008-10 #01
Shawn O. Pearce [Mon, 29 Sep 2008 18:45:20 +0000 (11:45 -0700)]
What's cooking 2008-09 #04
Junio C Hamano [Mon, 22 Sep 2008 19:41:48 +0000 (12:41 -0700)]
What's in/cooking
Junio C Hamano [Fri, 19 Sep 2008 20:55:07 +0000 (13:55 -0700)]
What's cooking 2008-09 #03
Junio C Hamano [Fri, 19 Sep 2008 03:12:40 +0000 (20:12 -0700)]
Additionally build JCH private edition
Junio C Hamano [Fri, 19 Sep 2008 03:12:10 +0000 (20:12 -0700)]
What's cooking/in 2008 Sep #2
Junio C Hamano [Thu, 18 Sep 2008 06:27:01 +0000 (23:27 -0700)]
Pass ASCIIDOC8=YesPlease to Meta/Make and dodoc.sh as needed
Junio C Hamano [Sun, 7 Sep 2008 06:16:20 +0000 (23:16 -0700)]
Doit: build-test documentation, too.
Junio C Hamano [Sun, 7 Sep 2008 03:44:31 +0000 (20:44 -0700)]
What's in and What's cooking (Sep '08, #1)
Junio C Hamano [Mon, 1 Sep 2008 06:15:17 +0000 (23:15 -0700)]
What's cooking update
Junio C Hamano [Thu, 28 Aug 2008 03:02:31 +0000 (20:02 -0700)]
What's in/cooking update
Junio C Hamano [Thu, 28 Aug 2008 02:00:50 +0000 (19:00 -0700)]
Avoid threaded delta
Junio C Hamano [Sun, 24 Aug 2008 03:38:38 +0000 (20:38 -0700)]
What's in/cooking updates
Junio C Hamano [Thu, 21 Aug 2008 00:32:24 +0000 (17:32 -0700)]
TODO updates
Junio C Hamano [Thu, 21 Aug 2008 00:32:08 +0000 (17:32 -0700)]
Allow -loose building
Junio C Hamano [Thu, 21 Aug 2008 00:31:47 +0000 (17:31 -0700)]
Allow building "jc special" as well
Junio C Hamano [Thu, 21 Aug 2008 00:29:58 +0000 (17:29 -0700)]
What's in/cooking updates
Junio C Hamano [Tue, 19 Aug 2008 09:00:12 +0000 (02:00 -0700)]
What's cooking Aug #05
Junio C Hamano [Tue, 19 Aug 2008 08:43:37 +0000 (01:43 -0700)]
What's in Aug #04
Junio C Hamano [Sun, 17 Aug 2008 23:49:55 +0000 (16:49 -0700)]
MaintNotes: Post 1.6.0 update
Junio C Hamano [Sun, 17 Aug 2008 10:17:55 +0000 (03:17 -0700)]
Update What's In
Junio C Hamano [Thu, 14 Aug 2008 08:57:16 +0000 (01:57 -0700)]
What's in 2008-08-14
Junio C Hamano [Thu, 14 Aug 2008 08:52:20 +0000 (01:52 -0700)]
What's cooking 2008-08-14
Junio C Hamano [Tue, 12 Aug 2008 00:26:24 +0000 (17:26 -0700)]
What's in/cooking updates
Junio C Hamano [Sun, 10 Aug 2008 07:46:38 +0000 (00:46 -0700)]
Minor fixes to WC and WI script
Junio C Hamano [Thu, 7 Aug 2008 01:38:56 +0000 (18:38 -0700)]
WI/WC script pair updates
Junio C Hamano [Wed, 6 Aug 2008 06:23:59 +0000 (23:23 -0700)]
Add Jul #09 issue of what's in
Junio C Hamano [Wed, 6 Aug 2008 05:46:42 +0000 (22:46 -0700)]
What's in/cooking updates
Junio C Hamano [Wed, 6 Aug 2008 04:42:17 +0000 (21:42 -0700)]
Split past issues of What's cooking and What's in
It was a mistake to use the same file over and over again, as it does not
generally make much sense to diff "what's in" and "what's cooking" between
revisions.
Junio C Hamano [Wed, 6 Aug 2008 04:42:45 +0000 (21:42 -0700)]
Update What's-in script
Junio C Hamano [Wed, 6 Aug 2008 04:41:38 +0000 (21:41 -0700)]
Add a few TODO items for post 1.6.0 cycle
Junio C Hamano [Thu, 31 Jul 2008 23:50:43 +0000 (16:50 -0700)]
Last WI/WC for Jul 2008
Junio C Hamano [Sat, 26 Jul 2008 07:44:24 +0000 (00:44 -0700)]
Meta/Make: make it easier to test bootstrapping
Junio C Hamano [Sat, 26 Jul 2008 07:43:36 +0000 (00:43 -0700)]
Update whatsin and whatscooking
Junio C Hamano [Mon, 21 Jul 2008 07:11:05 +0000 (00:11 -0700)]
What's in git.git (Jul 2008, issue #07; Sun, 20)
Junio C Hamano [Mon, 21 Jul 2008 06:59:37 +0000 (23:59 -0700)]
What's in git.git (Jul 2008, issue #06; Sat, 19)
Junio C Hamano [Mon, 21 Jul 2008 06:59:37 +0000 (23:59 -0700)]
What's in git.git (Jul 2008, issue #05; Tue, 15)
Junio C Hamano [Mon, 21 Jul 2008 06:59:37 +0000 (23:59 -0700)]
What's in git.git (Jul 2008, issue #04; Sun, 13)
Junio C Hamano [Mon, 21 Jul 2008 06:59:37 +0000 (23:59 -0700)]
What's in git.git (Jul 2008, issue #03; Mon, 07)
Junio C Hamano [Mon, 21 Jul 2008 06:59:37 +0000 (23:59 -0700)]
What's in git.git (Jul 2008, issue #02; Sun, 06)
Junio C Hamano [Mon, 21 Jul 2008 06:59:36 +0000 (23:59 -0700)]
What's in git.git (Jul 2008, issue #01; Tue, 01)
Junio C Hamano [Mon, 21 Jul 2008 06:59:36 +0000 (23:59 -0700)]
What's in git.git (Jun 2008, issue #04; Wed, 25)
Junio C Hamano [Mon, 21 Jul 2008 06:59:36 +0000 (23:59 -0700)]
What's in git.git (Jun 2008, issue #03; Mon, 23)
Junio C Hamano [Mon, 21 Jul 2008 06:59:36 +0000 (23:59 -0700)]
What's in git.git (Jun 2008, issue #02; Sat, 21)
Junio C Hamano [Mon, 21 Jul 2008 06:59:36 +0000 (23:59 -0700)]
What's in git.git (Jun 2008, issue #01; Wed, 18)
Junio C Hamano [Mon, 21 Jul 2008 05:59:00 +0000 (22:59 -0700)]
What's cooking in git.git (Jul 2008, issue #09; Sun, 20)
Junio C Hamano [Mon, 21 Jul 2008 05:59:00 +0000 (22:59 -0700)]
What's cooking in git.git (Jul 2008, issue #08; Sat, 19)
Junio C Hamano [Mon, 21 Jul 2008 05:58:59 +0000 (22:58 -0700)]
What's cooking in git.git (Jul 2008, issue #07; Thu, 17)