summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2020-03-11git-rebase.txt: highlight backend differences with commit rewordingLibravatar Elijah Newren1-0/+10
2020-03-11sequencer: clear state upon dropping a become-empty commitLibravatar Elijah Newren2-0/+10
2020-03-11i18n: unmark a message in rebase.cLibravatar Jiang Xin1-1/+1
2020-02-16rebase: rename the two primary rebase backendsLibravatar Elijah Newren18-168/+166
2020-02-16rebase: change the default backend from "am" to "merge"Libravatar Elijah Newren4-8/+22
2020-02-16rebase: make the backend configurable via config settingLibravatar Elijah Newren2-7/+32
2020-02-16rebase tests: repeat some tests using the merge backend instead of amLibravatar Elijah Newren2-4/+26
2020-02-16rebase tests: mark tests specific to the am-backend with --amLibravatar Elijah Newren11-53/+53
2020-02-16rebase: drop '-i' from the reflog for interactive-based rebasesLibravatar Elijah Newren3-10/+10
2020-02-16git-prompt: change the prompt for interactive-based rebasesLibravatar Elijah Newren2-9/+5
2020-02-16rebase: add an --am optionLibravatar Elijah Newren2-2/+27
2020-02-16rebase: move incompatibility checks between backend options a bit earlierLibravatar Elijah Newren1-11/+11
2020-02-16git-rebase.txt: add more details about behavioral differences of backendsLibravatar Elijah Newren1-5/+80
2020-02-16rebase: allow more types of rebases to fast-forwardLibravatar Elijah Newren2-4/+16
2020-02-16t3432: make these tests work with either am or merge backendsLibravatar Elijah Newren1-26/+22
2020-02-16rebase: fix handling of restrict_revisionLibravatar Elijah Newren2-3/+21
2020-02-16rebase: make sure to pass along the quiet flag to the sequencerLibravatar Elijah Newren2-2/+9
2020-02-16rebase, sequencer: remove the broken GIT_QUIET handlingLibravatar Elijah Newren2-8/+4
2020-02-16t3406: simplify an already simple testLibravatar Elijah Newren1-5/+2
2020-02-16rebase (interactive-backend): fix handling of commits that become emptyLibravatar Elijah Newren6-23/+183
2020-02-16rebase (interactive-backend): make --keep-empty the defaultLibravatar Elijah Newren9-55/+126
2020-01-17t3404: directly test the behavior of interestLibravatar Elijah Newren1-3/+4
2020-01-17git-rebase.txt: update description of --allow-empty-messageLibravatar Elijah Newren2-8/+11
2020-01-13Git 2.25Libravatar Junio C Hamano1-1/+1
2020-01-12Merge tag 'l10n-2.25.0-rnd1' of git://github.com/git-l10n/git-poLibravatar Junio C Hamano12-24312/+53740
2020-01-12Revert "Merge branch 'ra/rebase-i-more-options'"Libravatar Junio C Hamano7-327/+28
2020-01-12l10n: zh_CN: for git v2.25.0 l10n round 1Libravatar Jiang Xin1-2275/+2807
2020-01-11Merge branch 'master' of github.com:Softcatala/git-po into git-po-masterLibravatar Jiang Xin1-3757/+4260
2020-01-10Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks'Libravatar Junio C Hamano2-7/+7
2020-01-10Merge branch 'ma/config-advice-markup-fix'Libravatar Junio C Hamano1-1/+1
2020-01-10l10n: Update Catalan translationLibravatar Jordi Mas1-3757/+4260
2020-01-10mingw: safeguard better against backslashes in file namesLibravatar Johannes Schindelin via GitGitGadget2-7/+7
2020-01-10l10n: de.po: Update German translation v2.25.0 round 1Libravatar Matthias Rüster1-2282/+2844
2020-01-10l10n: de.po: Reword generation numbersLibravatar Thomas Braun1-1/+1
2020-01-09l10n: bg.po: Updated Bulgarian translation (4800t)Libravatar Alexander Shopov1-2353/+2905
2020-01-08config/advice.txt: fix description list separatorLibravatar Martin Ågren1-1/+1
2020-01-08Git 2.25-rc2Libravatar Junio C Hamano2-1/+5
2020-01-08Merge branch 'ds/graph-assert-fix'Libravatar Junio C Hamano2-8/+80
2020-01-08Merge branch 'tm/doc-submodule-absorb-fix'Libravatar Junio C Hamano1-1/+1
2020-01-08Merge branch 'pm/am-in-body-header-doc-update'Libravatar Junio C Hamano1-2/+2
2020-01-08Merge branch 'jb/doc-multi-pack-idx-fix'Libravatar Junio C Hamano1-1/+1
2020-01-08Merge branch 'do/gitweb-typofix-in-comments'Libravatar Junio C Hamano1-2/+2
2020-01-08Merge https://github.com/prati0100/git-guiLibravatar Junio C Hamano10-232/+920
2020-01-08graph: fix lack of color in horizontal linesLibravatar Derrick Stolee2-4/+38
2020-01-08graph: drop assert() for merge with two collapsing parentsLibravatar Derrick Stolee2-4/+42
2020-01-06The final batch before -rc2Libravatar Junio C Hamano1-2/+18
2020-01-06Merge branch 'ds/sparse-cone'Libravatar Junio C Hamano2-3/+3
2020-01-06Merge branch 'ds/commit-graph-set-size-mult'Libravatar Junio C Hamano2-4/+4
2020-01-06Merge branch 'en/merge-recursive-oid-eq-simplify'Libravatar Junio C Hamano1-22/+11
2020-01-06Merge branch 'ds/sparse-list-in-cone-mode'Libravatar Junio C Hamano3-1/+80
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-30 11:48:49 +0000