chiark / gitweb /
~ianmdlvl / dgit.git / search
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
git-debrebase: Merge: Put off some xxx's, making them MERGE-TODO
2018-08-19 Ian Jacksongit-debrebase: Merge: Put off some xxx's, making them...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-19 Ian Jacksongit-debrebase: Document merged-breakwater metadata tag
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-19 Ian Jacksongit-debrebase: Merge: Remove some xxx's
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-19 Ian Jacksonchangelog: Document changes to convert-from-gbp messages.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-19 Ian Jacksongit-debrebase: convert-from-gbp: Check separately for...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-19 Ian Jacksongit-debrebase: convert-from-gbp: Add a missing newline...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-19 Ian Jacksongit-debrebase: convert-from-gbp: handle missing maintainer tag
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-19 Ian Jacksontest suite: gdr-import-nostitch: New test
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-19 Ian Jacksongit-debrebase: convert-from-gbp; on stitch failure...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-19 Ian Jacksontest suite: gdr-convert-gbp: Break the start out into...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-19 Ian Jacksongit-debrebase: convert-from-gbp: Print a success message.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-19 Ian Jacksonchangelog: Add close note for #905400 to changelog...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-19 Ian Jacksontest suite: gdr-convert-gbp: test snag on unused patches
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-19 Ian Jacksongit-debrebase: convert-from-*: Snag on unused patches
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-19 Ian Jacksongit-debrebase: get_tree: Support $precheck and $recurse
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-19 Ian Jacksontest suite: gdr-subcommands: Test raw conversion from gbp
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-19 Ian Jacksontest suite: gdr-subcommands: Use $peel, not $work,...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-19 Ian Jacksontest suite: gdr-convert-gbp: Save converted-from-gbp
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-19 Ian Jacksongit-debrebase: On rebase, always save ffq-prev
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-19 Ian Jacksongit-debrebase: `prepush' is now a silent no-op if unstitched.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-19 Ian Jacksonchangelog: Add perf numbers
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-19 Ian Jacksongit-debrebase: Rewrite get_differs in terms of trees_diff_walk
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-19 Ian Jacksongit-debrebase: get_tree: Support '' for nonexistent...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-19 Ian Jacksongit-debrebase: New get_tree machinery: Fix debugging
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-19 Ian Jacksongit-debrebase: Fix comment documenting D_DEB_*
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-19 Ian Jacksongit-debrebase: Actually avoid read-tree in walk when...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-19 Ian Jacksongit-debrebase: Provide new get_tree and trees_diff_walk
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-19 Ian Jacksontest suite: unset GIT_EDITOR, so it works if user has...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-19 Ian Jacksongit-debrebase: Rename $want_tree_ to $want_
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-19 Ian Jacksongit-debrebase: Prep for avoid read-tree in walk when...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-19 Ian Jacksondgit(1): Encourage --overwrite rather than --overwrite...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-12 Ian Jacksongit-debrebase: walk: Introduce $read_tree_debian
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-12 Ian Jacksongit-debrebase: walk: Move $read_tree_upstream into...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-12 Ian Jacksongit-debrebase: Drop a redundant call to $read_tree_upstream
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-12 Ian Jacksongit-debrebase: merge: conflict: Some xxx's now done
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-12 Ian Jacksongit-debrebase: merge: test conflict: Test resolution...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-12 Ian Jacksongit-debrebase: merge: Actually use merge resolutions
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-12 Ian Jacksongit-debrebase: merge: Actually record merge resolutions
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-12 Ian Jacksongit-debrebase: scrap works properly when it does only...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-12 Ian Jacksongit-debrebase: merge: test conflict: Break out no-wreckage
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-12 Ian Jacksongit-debrebase: merge: Change wreckage to refs/debrebase...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-12 Ian JacksonDgit.pm: Move reflog_cache_* from dgit
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-12 Ian JacksonDgit.pm: Move $maindir* up the file.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-12 Ian JacksonDgit.pm: Move make_commit_text from dgit
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-12 Ian Jacksongit-debrebase: merge: New record-resolved-merge subcommand...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Split off merge_series_patchqueue_convert
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Record the new-base in the wreckage.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Use a fresh branch and check...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Introduce $merged_pq
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Use a couple of globals instead
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Introduce merge_attempt_cmd global
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Do wreckage cleaning separately
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: fresh_workarea: Support $subdir
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Prettify subprocess failures
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: test gdr-merge-conflicts: Test...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: test gdr-merge-conflicts: Break...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Minor style and error message...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Call merge_failed in merge_series
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Defeat evals which might try...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Save wreckage in $maindir
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Always save wreckage
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: test suite: Drop check of no...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: test suite: Check wreckage tidying
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Wreckage: tidy it up on successful...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Break out merge_wreckage_cleaning...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: test suite: Check wreckage saving
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Save wreckage if desired
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Introduce new merge_failed sub
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Make mwrecknote call printdebug
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Miscellaneous mwrecknote fixes
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: Break out run_ref_updates_now
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian JacksonDgit.pm: failmsg: Remove all double newlines, not just...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: gdr-merge test: Test an early...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksontest suite: Set DEBFULLNAME
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Introduce global mwrecknote sub
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: gdr-merge-conflicts test: New...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: gdr-merge test: sort out section...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Do not crash on branches with...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: Do not bail making patches if there...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: test: Introduce t-merge-conflicted-*
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: test: Drop stuff cloned from...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Add wreck note recording to merge_series
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Clarify an internal commit message
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Break out $mdebug
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Pass wreckage hashref to merge_series
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Introduce $mwrecknote in walk...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Whitespace changes
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Refactor interchange merge-base...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Fix a $nomerge message
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Add a comment about rewriting
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Remove a redundant check
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: mergedbreakwaters_anchor: Check...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Avoid needlessly walking MergedBreakwaters
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: test suite: Use t-ref-same-start
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: test suite: test avoiding re...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Avoid asking user to re-merge...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: test suite: Do a bit more testing
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksontest suite: lib-gdr: t-gdr-good: Handle MergedBreakwaters
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: merge: Add another xxx comment
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
2018-08-11 Ian Jacksongit-debrebase: walk: Reintroduce the local $read_tree_upstre...
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
 commit | commitdiff | tree
next
Unnamed repository; edit this file 'description' to name the repository.