chiark / gitweb /
~ianmdlvl / dgit.git / search
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
git-debrebase: NOTES: reword, record decisions about pm and ffq, tidy
2018-06-16 Ian Jacksongit-debrebase: fix $/ to be local in cfg (!)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksontest suite: gdr-edits: more
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: do not add -i in default invocation
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksontest suite: gbp2gdr: drop some branches we do not want...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksontest suite: gdr-edits: wip new test
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksontest suite: gbp2gdr: call t-setup-done
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksontest suite: gbp2gdr: drop junk at the end
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksontest suite: gbp2gdr: seems to work now
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksontest suite: something to have a salsa (general purpose...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: check head is clean before starting
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: use git_rev_parse 'HEAD' for "internal...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: test: use conventional branch names
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: for master branch, check dgit/dgit/sid too
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: bugfixes to record_ffq_prev
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: make cfg optionally take $optional ...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: wip cmd_record_ffq_prev
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: provide record_ffq_prev (no callers...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksondebian/control, git-debrebase: "use fnmatch;"
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: introduce --noop-ok
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: notes re ffq-prev ref name
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: intent re record-ffqrebase
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: intent re record-ffrebase
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksontest suite: gbp2gdr: use -f<tag> rather than --force
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: provide -f<tag>
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: introduce any_fproblems (nfc)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: introduce tags for fproblems, no use yet
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: more notes
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: note re debrebase push?
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: decide: make few pseudomerges, and preserve...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: notes re psuedomerges
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: notes
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: note that we have mostly done the gbp...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: insist that breakwater merges are merges
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: introduce $claims_to_be_breakwater ...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: explain why breakwater bases must be...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: fix misdetection of breakwater declarations...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: rework commit annotations
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: list tags currently written
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksontest suite: git-debrebase: turn on debug
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: bugfixes
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksontest suite: gbp2gdr: run gdr gbp2debrebase
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: wip gbp2debrebase
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksontest suite: initial git-debrebase setup attempts -...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksontest suite: initial git-debrebase setup attempts
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksontest suite: infrastructure for testing git-debrebase
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: Install it in /usr/bin
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: fix break out fproblem
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: fix several calls to git_cat_file
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: in new-upstream-v0 tolerate planned...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: break out fproblem
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: some notes about gbp import
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: some notes about gbp import
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: docs updates
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: rename NOTES to be more generic
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: provide default rebase action
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: update_head_postlaunder: print a message...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: new-upstream-v0: support passing git...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: new-upstream-v0: use update_head_postlaunder
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: fix changelog manip
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: break out update_head_postlaunder (nfc)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: whitespace
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: new-upstream-v0: use make_commit another...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: new-upstream-v0 break out make_commit
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: new-upstream-v0 bugfixes
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: break out dd (nfc)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: walk: print some more debug
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: parsecommit: fix confusing wrong handedness...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: parsecommit: fix Ix to not be off-by-one
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: new-upstream-v0: fixes
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: launder: print last upstream merge too
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: drop d/patches from all laundered commits
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: new-upstream-v0: use last upstream merge...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: walk: return last upstream merge in...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: bugfix
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: BUG due to some evidently unfinished...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: syntax fixes
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: wip new-upstream, ready for testing
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: new-upstream wip
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: new-upstream wip
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: add --force option (no users, so nfc)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: break out read_tree_subdir (nfc)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: break out rm_subdir_cached (nfc)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: wip new-upstream
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: fix: document that breakwater merges...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: break out parsecommit
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: document that breakwater merges always...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: launder: debug print why rewriting if...
commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: bugfixes
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: launder: print working tip too
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: fix rm of debian/patches not to mind...
commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: fix final diff check
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: fix parents in generated commits (!)
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: fix Mixed handling
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: when dieing due to bad commit, print...
commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: in classify, call get_differs with args...
commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: get_differs tolerates addition of debian...
commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: call setup_sigwarn
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: launder: fix
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: introduce update_head_checkout
 commit | commitdiff | tree
2018-06-16 Ian Jacksongit-debrebase: downstream-rebase-launder-v0 first cut
 commit | commitdiff | tree
next
Unnamed repository; edit this file 'description' to name the repository.