summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
* git-debrebase: get_tree: Support '' for nonexistent objectsIan Jackson2018-08-19
* git-debrebase: New get_tree machinery: Fix debuggingIan Jackson2018-08-19
* git-debrebase: Fix comment documenting D_DEB_*Ian Jackson2018-08-19
* git-debrebase: Actually avoid read-tree in walk when not rewritingIan Jackson2018-08-19
* git-debrebase: Provide new get_tree and trees_diff_walkIan Jackson2018-08-19
* test suite: unset GIT_EDITOR, so it works if user has that set.Ian Jackson2018-08-19
* git-debrebase: Rename $want_tree_ to $want_Ian Jackson2018-08-19
* git-debrebase: Prep for avoid read-tree in walk when not rewritingIan Jackson2018-08-19
* dgit(1): Encourage --overwrite rather than --overwrite=version.Ian Jackson2018-08-19
* git-debrebase: walk: Introduce $read_tree_debianIan Jackson2018-08-12
* git-debrebase: walk: Move $read_tree_upstream into the loopIan Jackson2018-08-12
* git-debrebase: Drop a redundant call to $read_tree_upstreamIan Jackson2018-08-12
* git-debrebase: merge: conflict: Some xxx's now doneIan Jackson2018-08-12
* git-debrebase: merge: test conflict: Test resolution via patchIan Jackson2018-08-12
* git-debrebase: merge: Actually use merge resolutionsIan Jackson2018-08-12
* git-debrebase: merge: Actually record merge resolutionsIan Jackson2018-08-12
* git-debrebase: scrap works properly when it does only rebase --abortIan Jackson2018-08-12
* git-debrebase: merge: test conflict: Break out no-wreckageIan Jackson2018-08-12
* git-debrebase: merge: Change wreckage to refs/debrebase/wreckage/*Ian Jackson2018-08-12
* Dgit.pm: Move reflog_cache_* from dgitIan Jackson2018-08-12
* Dgit.pm: Move $maindir* up the file.Ian Jackson2018-08-12
* Dgit.pm: Move make_commit_text from dgitIan Jackson2018-08-12
* git-debrebase: merge: New record-resolved-merge subcommand, WIPIan Jackson2018-08-12
* git-debrebase: merge: Split off merge_series_patchqueue_convertIan Jackson2018-08-11
* git-debrebase: merge: Record the new-base in the wreckage.Ian Jackson2018-08-11
* git-debrebase: merge: Use a fresh branch and check out againIan Jackson2018-08-11
* git-debrebase: merge: Introduce $merged_pqIan Jackson2018-08-11
* git-debrebase: merge: Use a couple of globals insteadIan Jackson2018-08-11
* git-debrebase: merge: Introduce merge_attempt_cmd globalIan Jackson2018-08-11
* git-debrebase: merge: Do wreckage cleaning separatelyIan Jackson2018-08-11
* git-debrebase: fresh_workarea: Support $subdirIan Jackson2018-08-11
* git-debrebase: merge: Prettify subprocess failuresIan Jackson2018-08-11
* git-debrebase: merge: test gdr-merge-conflicts: Test late wreckageIan Jackson2018-08-11
* git-debrebase: merge: test gdr-merge-conflicts: Break out wreckage-*Ian Jackson2018-08-11
* git-debrebase: merge: Minor style and error message changeIan Jackson2018-08-11
* git-debrebase: merge: Call merge_failed in merge_seriesIan Jackson2018-08-11
* git-debrebase: merge: Defeat evals which might try to trap merge_failedIan Jackson2018-08-11
* git-debrebase: merge: Save wreckage in $maindirIan Jackson2018-08-11
* git-debrebase: merge: Always save wreckageIan Jackson2018-08-11
* git-debrebase: merge: test suite: Drop check of no wreckage saveIan Jackson2018-08-11
* git-debrebase: merge: test suite: Check wreckage tidyingIan Jackson2018-08-11
* git-debrebase: merge: Wreckage: tidy it up on successful commandsIan Jackson2018-08-11
* git-debrebase: merge: Break out merge_wreckage_cleaning (nfc)Ian Jackson2018-08-11
* git-debrebase: merge: test suite: Check wreckage savingIan Jackson2018-08-11
* git-debrebase: merge: Save wreckage if desiredIan Jackson2018-08-11
* git-debrebase: merge: Introduce new merge_failed subIan Jackson2018-08-11
* git-debrebase: merge: Make mwrecknote call printdebugIan Jackson2018-08-11
* git-debrebase: merge: Miscellaneous mwrecknote fixesIan Jackson2018-08-11
* git-debrebase: Break out run_ref_updates_nowIan Jackson2018-08-11
* Dgit.pm: failmsg: Remove all double newlines, not just the firstIan Jackson2018-08-11