kernel/git - git - PowerEL Git System

Tree: 065bfb6d2e

Author	SHA1	Message	Date
Junio C Hamano	6e916ab439	Reintegrate: only detect conflict markers in conflicted files Otherwise we would misidentify new sections in documentation set marked with ======= as conflict markers.	16 years ago
Junio C Hamano	7aee035363	Reintegrate: Accept rerere by default	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	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