index
:
git.git
main
maint
master
next
seen
todo
The core git plumbing
Junio C. Hamano
about
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
Reintegrate
Age
Commit message (
Expand
)
Author
Files
Lines
2024-03-08
Meta/Reintegrate: work on a detached head
Junio C Hamano
1
-13
/
+40
2023-12-11
Reintegrate: cope with delete-modify conflicts
Junio C Hamano
1
-0
/
+21
2022-10-10
Meta/Reintegrate: omit source message ID from the merge message
Junio C Hamano
1
-0
/
+1
2022-01-24
Meta/Reintegrate: Breaks is a significant word
Junio C Hamano
1
-2
/
+2
2019-03-01
Reintegrate: check coccicheck-pending, too
Junio C Hamano
1
-2
/
+11
2019-03-01
Reintegrate: teach 'On hold' status
Junio C Hamano
1
-1
/
+2
2018-10-26
Meta/Reintegrate: do not apply cocci unless the tip advances
Junio C Hamano
1
-3
/
+13
2018-10-23
Meta/Reintegrate: allow applying cocci transformation
Junio C Hamano
1
-2
/
+32
2018-05-17
Meta/Reintegrate: allow output from Meta/cook -w to be pasted into the branch...
Junio C Hamano
1
-1
/
+1
2017-10-16
Meta/Reintegrate: make sure a merge stays a merge
Junio C Hamano
1
-1
/
+1
2017-07-07
Meta/cook: catch 'will wait...', too
Junio C Hamano
1
-1
/
+1
2016-09-21
Meta/Reintegrate: find the branch name literally in "What's cooking" reort
Junio C Hamano
1
-1
/
+1
2016-06-23
Meta/cook, Meta/Reintegrate: add a few more $willdo verbs
Junio C Hamano
1
-1
/
+1
2016-06-23
Meta/Reintegrate: give a blank to separate cut mark
Junio C Hamano
1
-1
/
+1
2016-06-23
Meta/Reintegrate: omit everything after $willdo verb
Junio C Hamano
1
-1
/
+1
2016-01-26
Meta/cook: 'Still doing something' is another keyphrase
Junio C Hamano
1
-1
/
+1
2015-03-06
Meta/Reintegrate: need to override GIT_EDITOR
Junio C Hamano
1
-3
/
+3
2015-02-24
Meta/Reintegrate: use older editions of what's cooking report as needed
Junio C Hamano
1
-20
/
+39
2014-10-24
Meta/Reintegrate: show what happened during the fix-up
Junio C Hamano
1
-0
/
+1
2014-04-16
Meta/Reintegrate: pass custom merge options
Junio C Hamano
1
-1
/
+3
2013-11-21
Meta/Reintegrate: pick up "Can wait in", too
Junio C Hamano
1
-0
/
+1
2013-07-19
Meta/Reintegrate: ignroe whitespace when comparing list of topics
Junio C Hamano
1
-2
/
+2
2013-07-19
Meta/Reintegrate: guard for misspelt topic name
Junio C Hamano
1
-3
/
+5
2013-05-24
Reintegrate: remove the "what next" markers from log messages
Junio C Hamano
1
-1
/
+20
2013-01-09
Meta/Reintegrate: omit cut mark if no topics were merged from the group
Junio C Hamano
1
-3
/
+12
2013-01-08
Meta/Reintegrate: try keeping the cut points with comments
Junio C Hamano
1
-4
/
+24
2013-01-03
Meta/Reintegrate: report the "cut" points
Junio C Hamano
1
-1
/
+7
2012-10-24
Reintegrate: use --no-decorate with log --oneline
Jeff King
1
-1
/
+1
2012-09-13
Meta/cook: format the topic description with indentation
Junio C Hamano
1
-6
/
+9
2012-07-16
Meta/Reintegrate: force invoking the editor when merging
Junio C Hamano
1
-1
/
+1
2012-06-27
Meta/Reintegrate: work around minor --no-edit breakage
Junio C Hamano
1
-1
/
+1
2012-04-27
Meta/Reintegrate: stop at a cut ### line
Junio C Hamano
1
-1
/
+11
2012-03-16
Meta/Reintegrate: allow each step to be optionally amended
Junio C Hamano
1
-2
/
+5
2012-03-12
Meta/Reintegrate: propagate branch description from whats-cooking.txt
Junio C Hamano
1
-1
/
+52
2012-03-12
Meta/Reintegrate: redo the rerere part
Junio C Hamano
1
-10
/
+7
2012-02-09
Meta/Reintegrate: use merge --no-edit
Junio C Hamano
1
-1
/
+1
2011-10-19
Meta/Reintegrate: allow comment in redo list
Junio C Hamano
1
-2
/
+2
2011-05-18
Meta/Reintegrate: -u should default to safer "n" option
Junio C Hamano
1
-1
/
+1
2011-02-22
Reintegrate: make merge-fix-up more noticeable
Junio C Hamano
1
-0
/
+1
2010-12-08
Reintegrate: abort the whole thing when commit is aborted
Junio C Hamano
1
-1
/
+1
2010-07-08
Meta/Reintegrate: make generated scripts support -u/-d options themselves
Junio C Hamano
1
-0
/
+4
2010-05-26
Reintegrate: allow regeneration of test integration on a detached HEAD
Junio C Hamano
1
-2
/
+2
2010-05-03
Reintegrate: do not fail when garbage is found in the orignal
Junio C Hamano
1
-1
/
+1
2010-03-20
Reintegrate: allow comments in the input
Junio C Hamano
1
-0
/
+1
2010-02-23
Reintegrate: allow update/diff
Junio C Hamano
1
-25
/
+74
2010-01-10
Reintegrate: handle merging from remote tracking branches
Junio C Hamano
1
-4
/
+17
2009-11-25
Reintegrate: move sequencer code out of the output
Junio C Hamano
1
-43
/
+50
2009-11-14
Meta/Reintegrate: allow refs/merge-fix/* to supply evil-merge-fixups
Junio C Hamano
1
-1
/
+7
2009-11-14
Meta/Reintegrate: do not trigger pre-commit filter on merges
Junio C Hamano
1
-1
/
+1
2009-04-02
Reintegrate: only detect conflict markers in conflicted files
Junio C Hamano
1
-2
/
+3
2009-03-30
Reintegrate: Accept rerere by default
Junio C Hamano
1
-3
/
+28
2009-02-13
Reintegrate: sometimes a specific cherry-pick need to be carried forward
Junio C Hamano
1
-11
/
+29
2009-01-26
Add Meta/Reintegrate
Junio C Hamano
1
-0
/
+42