summaryrefslogtreecommitdiff
path: root/Documentation/git-rebase.txt
AgeCommit message (Expand)AuthorFilesLines
2021-12-01update documentation for new zdiff3 conflictStyleLibravatar Elijah Newren1-3/+3
2021-10-18Merge branch 'js/retire-preserve-merges'Libravatar Junio C Hamano1-51/+0
2021-10-06Merge branch 'ws/refer-to-forkpoint-config-in-rebase-doc'Libravatar Junio C Hamano1-1/+2
2021-09-20Document `rebase.forkpoint` in rebase man pageLibravatar Wesley Schwengle1-1/+2
2021-09-10Merge branch 'js/advise-when-skipping-cherry-picked'Libravatar Junio C Hamano1-4/+8
2021-09-07rebase: drop support for `--preserve-merges`Libravatar Johannes Schindelin1-51/+0
2021-08-30sequencer: advise if skipping cherry-picked commitLibravatar Josh Steadmon1-4/+8
2021-08-05Update docs for change of default merge backendLibravatar Elijah Newren1-14/+14
2021-08-05git-rebase.txt: correct out-of-date and misleading text about renamesLibravatar Elijah Newren1-3/+1
2021-08-05merge-strategies.txt: fix simple capitalization errorLibravatar Elijah Newren1-1/+1
2021-08-05Documentation: edit awkward references to `git merge-recursive`Libravatar Elijah Newren1-3/+2
2021-08-05git-rebase.txt: correct antiquated claims about --rebase-mergesLibravatar Elijah Newren1-6/+10
2021-05-07Merge branch 'ab/rebase-no-reschedule-failed-exec'Libravatar Junio C Hamano1-0/+8
2021-04-10docs: fix linting issues due to incorrect relative section orderLibravatar Ævar Arnfjörð Bjarmason1-6/+6
2021-04-10rebase: don't override --no-reschedule-failed-exec with configLibravatar Ævar Arnfjörð Bjarmason1-0/+8
2021-03-15doc/git-commit: add documentation for fixup=[amend|reword] optionsLibravatar Charvi Mendiratta1-10/+11
2021-02-10doc/rebase -i: fix typo in the documentation of 'fixup' commandLibravatar Charvi Mendiratta1-1/+1
2021-01-29doc/git-rebase: add documentation for fixup [-C|-c] optionsLibravatar Charvi Mendiratta1-3/+11
2020-10-20Documentation: stylistically normalize references to Signed-off-by:Libravatar Bradley M. Kuhn1-1/+1
2020-09-03Merge branch 'pb/doc-sequence-editor-configuration'Libravatar Junio C Hamano1-0/+1
2020-09-03Merge branch 'pw/rebase-i-more-options'Libravatar Junio C Hamano1-6/+27
2020-08-31doc: mention GIT_SEQUENCE_EDITOR and 'sequence.editor' moreLibravatar Philippe Blain1-0/+1
2020-08-19rebase: add --reset-author-dateLibravatar Rohit Ashiwal1-0/+1
2020-08-19rebase -i: support --ignore-dateLibravatar Phillip Wood1-3/+4
2020-08-17rebase -i: support --committer-date-is-author-dateLibravatar Phillip Wood1-3/+7
2020-07-13rebase -i: add --ignore-whitespace flagLibravatar Rohit Ashiwal1-2/+17
2020-07-09Merge branch 'ma/rebase-doc-typofix' into masterLibravatar Junio C Hamano1-1/+1
2020-07-09git-rebase.txt: fix description list separatorLibravatar Martin Ågren1-1/+1
2020-05-05Doc: reference the "stash list" in autostash docsLibravatar Denton Liu1-1/+1
2020-05-01Merge branch 'en/rebase-root-and-fork-point-are-incompatible'Libravatar Junio C Hamano1-2/+5
2020-04-29Merge branch 'dl/merge-autostash-rebase-quit-fix'Libravatar Junio C Hamano1-1/+2
2020-04-28Merge branch 'en/rebase-doc-hooks-called-by-accident'Libravatar Junio C Hamano1-3/+11
2020-04-28rebase: save autostash entry into stash reflog on --quitLibravatar Denton Liu1-1/+2
2020-04-27rebase: display an error if --root and --fork-point are both providedLibravatar Elijah Newren1-2/+5
2020-04-22Merge branch 'jt/rebase-allow-duplicate'Libravatar Junio C Hamano1-2/+23
2020-04-22Merge branch 'en/rebase-no-keep-empty'Libravatar Junio C Hamano1-16/+31
2020-04-22Merge branch 'dd/no-gpg-sign'Libravatar Junio C Hamano1-1/+4
2020-04-22Merge branch 'pb/rebase-doc-typofix'Libravatar Junio C Hamano1-1/+1
2020-04-11rebase --merge: optionally skip upstreamed commitsLibravatar Jonathan Tan1-2/+23
2020-04-11rebase: reinstate --no-keep-emptyLibravatar Elijah Newren1-17/+31
2020-04-11rebase -i: mark commits that begin empty in todo editorLibravatar Elijah Newren1-1/+2
2020-04-05git-rebase.txt: add another hook to the hooks section, and explain moreLibravatar Elijah Newren1-3/+11
2020-04-03rebase.c: honour --no-gpg-signLibravatar Đoàn Trần Công Danh1-1/+4
2020-03-28git-rebase.txt: fix typoLibravatar Philippe Blain1-1/+1
2020-03-11git-rebase.txt: highlight backend differences with commit rewordingLibravatar Elijah Newren1-0/+10
2020-02-16rebase: rename the two primary rebase backendsLibravatar Elijah Newren1-36/+41
2020-02-16rebase: change the default backend from "am" to "merge"Libravatar Elijah Newren1-1/+12
2020-02-16rebase: add an --am optionLibravatar Elijah Newren1-1/+10
2020-02-16git-rebase.txt: add more details about behavioral differences of backendsLibravatar Elijah Newren1-5/+80
2020-02-16rebase (interactive-backend): fix handling of commits that become emptyLibravatar Elijah Newren1-3/+26
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-21 07:42:44 +0000