kernel/git - git - PowerEL Git System

Commit Graph

Author	SHA1	Message	Date
Junio C Hamano	11ac3c74fd	Update Dothem to build if jch and next are different	16 years ago
Junio C Hamano	fa879484d9	Update Dothem to be more quiet	16 years ago
Junio C Hamano	41ceab1f3f	What's cooking	16 years ago
Junio C Hamano	a58b4f28b3	What's in -- first mass graduation post 1.6.2	16 years ago
Junio C Hamano	2f8e43af4f	Dothem update	16 years ago
Junio C Hamano	61442a7ec3	What's in/cooking	16 years ago
Junio C Hamano	0f6f6ec046	Add Dothem script This keeps the checkout around and performs much better than Doit.	16 years ago
Junio C Hamano	1c35937ee6	Post 1.6.2 maintnotes updates Thank new contributors as well.	16 years ago
Junio C Hamano	cb9b3a72e5	SE: allow arbitrary send-email options after --	16 years ago
Junio C Hamano	6ff8635f65	Remove bunch of stale issues - the list is unmaintained these days	16 years ago
Junio C Hamano	4b645ba35d	Remove emacsorg-mode list; it seems to be moderated	16 years ago
Junio C Hamano	b0eb1eceaa	Leftover what's cooking	16 years ago
Junio C Hamano	9eddb0394c	What's in	16 years ago
Junio C Hamano	c8b60850d0	What's in	16 years ago
Junio C Hamano	9ae0b37c94	What's cooking	16 years ago
Junio C Hamano	f68ee0e341	Update Announce for release candidates and use ProjectContact	16 years ago
Junio C Hamano	735f9d11ed	Add ProjectContact script	16 years ago
Junio C Hamano	c1b07915ae	What's in	16 years ago
Junio C Hamano	217580b83e	What's cooking	16 years ago
Junio C Hamano	dc27452ae4	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.	16 years ago
Junio C Hamano	61e41ee04e	What's in	16 years ago
Junio C Hamano	280195b2cb	What's cooking as of 1.6.2-rc0	16 years ago
Junio C Hamano	2c74528332	What's cooking	16 years ago
Junio C Hamano	5ed7079afa	What's in update	16 years ago
Junio C Hamano	82b0e7fc7d	What's cooking update	16 years ago
Junio C Hamano	24e17294da	Add Meta/GRADUATED	16 years ago
Junio C Hamano	2e098204b2	What's in/cooking	16 years ago
Junio C Hamano	e97499e1d3	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>	16 years ago
Junio C Hamano	d0fd6f06eb	What's in/cooking updates	16 years ago
Junio C Hamano	84f76d066e	Summary: use reflog	16 years ago
Junio C Hamano	67b8da7260	Doit: add -noinstall	16 years ago
Junio C Hamano	1469eaa3e3	V: pay attention to dirty versions	16 years ago
Junio C Hamano	6d8ad71377	Doit: allow private editions	16 years ago
Junio C Hamano	7cd55ea54f	Make: threaded-delta-search should be safe by now	16 years ago
Junio C Hamano	6b3472e1c7	SE: no suppress-cc; use configuration	16 years ago
Junio C Hamano	a618965ab4	What's cooking updates	16 years ago
Junio C Hamano	4d77538f69	What's cooking	16 years ago
Junio C Hamano	5c63e23689	What's in	16 years ago
Junio C Hamano	91f1ddd855	What's in/cooking updates	16 years ago
Junio C Hamano	fd9c96c858	What's cooking issue #2 of Jan'09	16 years ago
Junio C Hamano	bd142399d8	What's cooking 2009-01 issue #1	16 years ago
Junio C Hamano	e518dea10c	Last issue of What's in/cooking for 2008	16 years ago
Junio C Hamano	6670008134	Post 1.6.1 updates	16 years ago
Junio C Hamano	cdd9a3e433	What's in/cooking	16 years ago
Junio C Hamano	7b798d8cc4	What's in/cooking	16 years ago
Junio C Hamano	8b2fe5f402	What's in/cooking updates	16 years ago
Junio C Hamano	9c36507110	What's in/cooking updates	16 years ago
Junio C Hamano	742d36744e	What's in/cooking	17 years ago
Junio C Hamano	9f43e271de	What's in/cooking	17 years ago
Junio C Hamano	aea6d5b843	What's cooking #3 of Nov 2008	17 years ago

1 2 3 4 5 ...

441 Commits (11ac3c74fd8d565f67d0fae35bba2237f90e481a) All Branches Search

441 Commits (11ac3c74fd8d565f67d0fae35bba2237f90e481a)

All Branches