aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/git-rebase.txt
AgeCommit message (Expand)AuthorFilesLines
2024-04-03Merge branch 'bl/cherry-pick-empty'Junio C Hamano1-9/+17
2024-03-25rebase: update `--empty=ask` to `--empty=stop`Brian Lyles1-7/+8
2024-03-25docs: clean up `--empty` formatting in git-rebase(1) and git-am(1)Brian Lyles1-9/+16
2024-03-25docs: address inaccurate `--empty` default with `--exec`Brian Lyles1-5/+5
2024-03-25Merge branch 'ja/doc-formatting-fix'Junio C Hamano1-1/+1
2024-03-16doc: format alternatives in synopsisJean-Noël Avila1-1/+1
2024-03-05Merge branch 'ak/rebase-autosquash'Junio C Hamano1-1/+1
2024-02-27rebase: fix typo in autosquash documentationRichard Macklin1-1/+1
2024-01-29Merge branch 'nb/rebase-x-shell-docfix'Junio C Hamano1-4/+3
2024-01-17rebase: fix documentation about used shell in -xNikolay Borisov1-4/+3
2024-01-16Merge branch 'ib/rebase-reschedule-doc'Junio C Hamano1-7/+10
2024-01-12Merge branch 'ms/rebase-insnformat-doc-fix'Junio C Hamano1-1/+1
2024-01-05rebase: clarify --reschedule-failed-exec defaultIllia Bobyr1-7/+10
2024-01-03Documentation: fix statement about rebase.instructionFormatMaarten van der Schrieck1-1/+1
2023-11-16rebase: rewrite --(no-)autosquash documentationAndy Koppe1-14/+20
2023-11-16rebase: support --autosquash without -iAndy Koppe1-1/+1
2023-10-29am, rebase: fix arghelp syntax of --emptyRené Scharfe1-2/+2
2023-03-27rebase: add a config option for --rebase-mergesAlex Henrie1-1/+2
2023-03-27rebase: add documentation and test for --no-rebase-mergesAlex Henrie1-7/+11
2023-01-25rebase: provide better error message for apply options vs. merge configElijah Newren1-1/+1
2023-01-25rebase: fix formatting of rebase --reapply-cherry-picks option in docsElijah Newren1-2/+0
2023-01-25rebase: clarify the OPT_CMDMODE incompatibilitiesElijah Newren1-28/+33
2023-01-25rebase: fix incompatiblity checks for --[no-]reapply-cherry-picksElijah Newren1-1/+1
2023-01-25rebase: fix docs about incompatibilities with --rootElijah Newren1-5/+2
2023-01-25rebase: remove --allow-empty-message from incompatible optsElijah Newren1-1/+0
2023-01-25rebase: mark --update-refs as requiring the merge backendElijah Newren1-0/+2
2023-01-13git-rebase.txt: add a note about 'ORIG_HEAD' being overwrittenPhilippe Blain1-0/+7
2022-10-30Merge branch 'pw/rebase-keep-base-fixes'Taylor Blau1-13/+19
2022-10-17rebase --keep-base: imply --no-fork-pointPhillip Wood1-4/+4
2022-10-17rebase --keep-base: imply --reapply-cherry-picksPhillip Wood1-10/+16
2022-09-14Merge branch 'ab/dedup-config-and-command-docs'Junio C Hamano1-0/+2
2022-09-07docs: add and use include template for config/* includesÆvar Arnfjörð Bjarmason1-0/+2
2022-08-14Merge branch 'jc/rerere-autoupdate-doc'Junio C Hamano1-4/+1
2022-08-03doc: consolidate --rerere-autoupdate descriptionJunio C Hamano1-4/+1
2022-08-01Merge branch 'ds/rebase-update-ref'Junio C Hamano1-0/+10
2022-07-19rebase: add rebase.updateRefs config optionDerrick Stolee1-0/+3
2022-07-19rebase: add --update-refs optionDerrick Stolee1-0/+7
2022-06-30git-rebase.txt: use back-ticks consistentlyDerrick Stolee1-120/+122
2022-04-21rebase: use correct base for --keep-base when a branch is givenAlex Henrie1-2/+3
2021-12-01update documentation for new zdiff3 conflictStyleElijah Newren1-3/+3
2021-10-18Merge branch 'js/retire-preserve-merges'Junio C Hamano1-51/+0
2021-10-06Merge branch 'ws/refer-to-forkpoint-config-in-rebase-doc'Junio C Hamano1-1/+2
2021-09-20Document `rebase.forkpoint` in rebase man pageWesley Schwengle1-1/+2
2021-09-10Merge branch 'js/advise-when-skipping-cherry-picked'Junio C Hamano1-4/+8
2021-09-07rebase: drop support for `--preserve-merges`Johannes Schindelin1-51/+0
2021-08-30sequencer: advise if skipping cherry-picked commitJosh Steadmon1-4/+8
2021-08-05Update docs for change of default merge backendElijah Newren1-14/+14
2021-08-05git-rebase.txt: correct out-of-date and misleading text about renamesElijah Newren1-3/+1
2021-08-05merge-strategies.txt: fix simple capitalization errorElijah Newren1-1/+1
2021-08-05Documentation: edit awkward references to `git merge-recursive`Elijah Newren1-3/+2
2021-08-05git-rebase.txt: correct antiquated claims about --rebase-mergesElijah Newren1-6/+10
2021-05-07Merge branch 'ab/rebase-no-reschedule-failed-exec'Junio C Hamano1-0/+8
2021-04-10docs: fix linting issues due to incorrect relative section orderÆvar Arnfjörð Bjarmason1-6/+6
2021-04-10rebase: don't override --no-reschedule-failed-exec with configÆvar Arnfjörð Bjarmason1-0/+8
2021-03-15doc/git-commit: add documentation for fixup=[amend|reword] optionsCharvi Mendiratta1-10/+11
2021-02-10doc/rebase -i: fix typo in the documentation of 'fixup' commandCharvi Mendiratta1-1/+1
2021-01-29doc/git-rebase: add documentation for fixup [-C|-c] optionsCharvi Mendiratta1-3/+11
2020-10-20Documentation: stylistically normalize references to Signed-off-by:Bradley M. Kuhn1-1/+1
2020-09-03Merge branch 'pb/doc-sequence-editor-configuration'Junio C Hamano1-0/+1
2020-09-03Merge branch 'pw/rebase-i-more-options'Junio C Hamano1-6/+27
2020-08-31doc: mention GIT_SEQUENCE_EDITOR and 'sequence.editor' morePhilippe Blain1-0/+1
2020-08-19rebase: add --reset-author-dateRohit Ashiwal1-0/+1
2020-08-19rebase -i: support --ignore-datePhillip Wood1-3/+4
2020-08-17rebase -i: support --committer-date-is-author-datePhillip Wood1-3/+7
2020-07-13rebase -i: add --ignore-whitespace flagRohit Ashiwal1-2/+17
2020-07-09Merge branch 'ma/rebase-doc-typofix' into masterJunio C Hamano1-1/+1
2020-07-09git-rebase.txt: fix description list separatorMartin Ågren1-1/+1
2020-05-05Doc: reference the "stash list" in autostash docsDenton Liu1-1/+1
2020-05-01Merge branch 'en/rebase-root-and-fork-point-are-incompatible'Junio C Hamano1-2/+5
2020-04-29Merge branch 'dl/merge-autostash-rebase-quit-fix'Junio C Hamano1-1/+2
2020-04-28Merge branch 'en/rebase-doc-hooks-called-by-accident'Junio C Hamano1-3/+11
2020-04-28rebase: save autostash entry into stash reflog on --quitDenton Liu1-1/+2
2020-04-27rebase: display an error if --root and --fork-point are both providedElijah Newren1-2/+5
2020-04-22Merge branch 'jt/rebase-allow-duplicate'Junio C Hamano1-2/+23
2020-04-22Merge branch 'en/rebase-no-keep-empty'Junio C Hamano1-16/+31
2020-04-22Merge branch 'dd/no-gpg-sign'Junio C Hamano1-1/+4
2020-04-22Merge branch 'pb/rebase-doc-typofix'Junio C Hamano1-1/+1
2020-04-11rebase --merge: optionally skip upstreamed commitsJonathan Tan1-2/+23
2020-04-11rebase: reinstate --no-keep-emptyElijah Newren1-17/+31
2020-04-11rebase -i: mark commits that begin empty in todo editorElijah Newren1-1/+2
2020-04-05git-rebase.txt: add another hook to the hooks section, and explain moreElijah Newren1-3/+11
2020-04-03rebase.c: honour --no-gpg-signĐoàn Trần Công Danh1-1/+4
2020-03-28git-rebase.txt: fix typoPhilippe Blain1-1/+1
2020-03-11git-rebase.txt: highlight backend differences with commit rewordingElijah Newren1-0/+10
2020-02-16rebase: rename the two primary rebase backendsElijah Newren1-36/+41
2020-02-16rebase: change the default backend from "am" to "merge"Elijah Newren1-1/+12
2020-02-16rebase: add an --am optionElijah Newren1-1/+10
2020-02-16git-rebase.txt: add more details about behavioral differences of backendsElijah Newren1-5/+80
2020-02-16rebase (interactive-backend): fix handling of commits that become emptyElijah Newren1-3/+26
2020-02-16rebase (interactive-backend): make --keep-empty the defaultElijah Newren1-11/+13
2020-01-17git-rebase.txt: update description of --allow-empty-messageElijah Newren1-3/+4
2020-01-12Revert "Merge branch 'ra/rebase-i-more-options'"Junio C Hamano1-21/+6
2019-12-10Merge branch 'ra/rebase-i-more-options'Junio C Hamano1-6/+21
2019-11-25rebase -i: finishing touches to --reset-author-dateJunio C Hamano1-2/+4
2019-11-12doc: improve readability of --rebase-merges in git-rebaseNaveen Nathan1-2/+2
2019-11-02rebase: add --reset-author-dateRohit Ashiwal1-0/+1
2019-11-02rebase -i: support --ignore-dateRohit Ashiwal1-3/+3
2019-11-02rebase -i: support --committer-date-is-author-dateRohit Ashiwal1-3/+7
2019-11-02rebase -i: add --ignore-whitespace flagRohit Ashiwal1-2/+10
2019-09-30Merge branch 'dl/rebase-i-keep-base'Junio C Hamano1-3/+27
2019-09-30Merge branch 'en/filter-branch-deprecation'Junio C Hamano1-1/+2
2019-09-18Merge branch 'js/rebase-r-strategy'Junio C Hamano1-2/+0
2019-09-05Recommend git-filter-repo instead of git-filter-branchElijah Newren1-1/+2
2019-08-27rebase: teach rebase --keep-baseDenton Liu1-3/+27
2019-07-31rebase -r: support merge strategies other than `recursive`Johannes Schindelin1-2/+0
2019-07-09Merge branch 'nd/switch-and-restore'Junio C Hamano1-1/+1
2019-07-09Merge branch 'pw/doc-synopsis-markup-opmode-options'Junio C Hamano1-1/+1
2019-06-17show --continue/skip etc. consistently in synopsisPhillip Wood1-1/+1
2019-05-30Merge branch 'js/rebase-deprecate-preserve-merges'Junio C Hamano1-2/+3
2019-05-28rebase docs: recommend `-r` over `-p`Johannes Schindelin1-2/+3
2019-04-16Merge branch 'pw/rerere-autoupdate'Junio C Hamano1-0/+5
2019-04-10Merge branch 'js/rebase-deprecate-preserve-merges'Junio C Hamano1-11/+12
2019-04-02doc: promote "git switch"Nguyễn Thái Ngọc Duy1-1/+1
2019-03-18am/cherry-pick/rebase/revert: document --rerere-autoupdatePhillip Wood1-0/+5
2019-03-12rebase: deprecate --preserve-mergesJohannes Schindelin1-11/+12
2019-03-11Merge branch 'js/rebase-recreate-merge'Junio C Hamano1-1/+1
2019-03-01rebase docs: fix "gitlink" typoKyle Meyer1-1/+1
2019-02-14Merge branch 'ea/rebase-compat-doc-fix'Junio C Hamano1-1/+0
2019-02-14Merge branch 'en/rebase-merge-on-sequencer'Junio C Hamano1-2/+0
2019-02-14git-rebase.txt: update to reflect merge now implemented on sequencerElijah Newren1-2/+0
2019-02-14docs/git-rebase: remove redundant entry in incompatible options listEmilio Cobos Álvarez1-1/+0
2019-02-08Merge branch 'js/rebase-i-redo-exec-fix'Junio C Hamano1-6/+0
2019-02-06Merge branch 'en/rebase-merge-on-sequencer'Junio C Hamano1-14/+3
2019-02-06Revert "rebase: introduce a shortcut for --reschedule-failed-exec"Johannes Schindelin1-6/+0
2019-01-29Merge branch 'js/rebase-i-redo-exec'Junio C Hamano1-0/+11
2019-01-14Merge branch 'en/directory-renames-nothanks-doc-update'Junio C Hamano1-2/+3
2019-01-14Merge branch 'km/rebase-doc-typofix'Junio C Hamano1-1/+1
2019-01-07rebase: implement --merge via the interactive machineryElijah Newren1-14/+3
2018-12-11rebase: introduce a shortcut for --reschedule-failed-execJohannes Schindelin1-0/+6
2018-12-11rebase: introduce --reschedule-failed-execJohannes Schindelin1-0/+5
2018-12-10rebase docs: drop stray word in merge command descriptionKyle Meyer1-1/+1
2018-12-09git-rebase.txt: update note about directory rename detection and amElijah Newren1-2/+3
2018-12-04Merge branch 'en/rebase-consistency'Junio C Hamano1-13/+17
2018-12-04rebase docs: fix incorrect format of the section Behavioral DifferencesJohannes Sixt1-13/+17
2018-11-13Merge branch 'nd/config-split'Junio C Hamano1-1/+1
2018-11-02Merge branch 'js/rebase-i-break'Junio C Hamano1-1/+5
2018-10-29config.txt: move rebase-config.txt to config/Nguyễn Thái Ngọc Duy1-1/+1
2018-10-12rebase -i: introduce the 'break' commandJohannes Schindelin1-0/+3
2018-10-11rebase -i: clarify what happens on a failed `exec`Johannes Schindelin1-1/+2
2018-10-07docs: typo: s/isimilar/similar/Michael Witten1-1/+1
2018-08-02Merge branch 'js/rebase-merge-octopus'Junio C Hamano1-3/+4
2018-07-24Merge branch 'en/rebase-consistency'Junio C Hamano1-27/+108
2018-07-18Merge branch 'js/rebase-recreate-merge'Junio C Hamano1-1/+1
2018-07-11rebase --rebase-merges: adjust man page for octopus supportJohannes Schindelin1-3/+4
2018-06-27git-rebase: make --allow-empty-message the defaultElijah Newren1-10/+0
2018-06-27git-rebase.txt: document behavioral differences between modesElijah Newren1-0/+32
2018-06-27git-rebase.txt: address confusion between --no-ff vs --force-rebaseElijah Newren1-20/+10
2018-06-27rebase: fix documentation formattingVladimir Parfinenko1-1/+1
2018-06-26git-rebase.txt: document incompatible optionsElijah Newren1-8/+77
2018-05-25Use proper syntax for replaceables in command docsRobert P. J. Day1-2/+2
2018-04-26rebase -i --rebase-merges: add a section to the man pageJohannes Schindelin1-0/+135
2018-04-26rebase -i: introduce --rebase-merges=[no-]rebase-cousinsJohannes Schindelin1-4/+11
2018-04-26rebase: introduce the --rebase-merges optionJohannes Schindelin1-1/+20
2018-04-25Merge branch 'pw/rebase-signoff'Junio C Hamano1-3/+4
2018-03-29rebase: extend --signoff supportPhillip Wood1-3/+4
2018-03-06Merge branch 'nd/rebase-show-current-patch'Junio C Hamano1-1/+6
2018-02-12rebase: introduce and use pseudo-ref REBASE_HEADNguyễn Thái Ngọc Duy1-1/+2
2018-02-12rebase: add --show-current-patchNguyễn Thái Ngọc Duy1-1/+5
2018-02-07rebase: add --allow-empty-message optionGenki Sky1-0/+5
2017-12-04Documentation: move rebase.* configs to new fileLiam Beguin1-18/+1
2017-10-03Merge branch 'js/rebase-i-final'Junio C Hamano1-7/+9
2017-08-23treewide: correct several "up-to-date" to "up to date"Martin Ågren1-1/+1
2017-07-27rebase -i: rearrange fixup/squash lines using the rebase--helperJohannes Schindelin1-7/+9
2017-07-12Merge branch 'ks/fix-rebase-doc-picture'Junio C Hamano1-1/+1
2017-07-10doc: correct a mistake in an illustrationKaartic Sivaraam1-1/+1
2017-06-18stash: update documentation to use 'stash entry'Liam Beguin1-1/+1
2017-04-26Merge branch 'gb/rebase-signoff'Junio C Hamano1-0/+5
2017-04-18rebase: pass --[no-]signoff option to git amGiuseppe Bilotta1-0/+5
2016-12-19Merge branch 'nd/rebase-forget'Junio C Hamano1-1/+6
2016-12-11rebase: add --quit to cleanup rebase, leave everything else untouchedNguyễn Thái Ngọc Duy1-1/+6
2016-07-28Merge branch 'mm/doc-tt' into maintJunio C Hamano1-5/+5
2016-07-13Merge branch 'mm/doc-tt'Junio C Hamano1-5/+5
2016-06-28doc: typeset long command-line options as literalMatthieu Moy1-5/+5
2016-03-18rebase: decouple --exec from --interactiveStefan Beller1-3/+3
2016-03-02Documentation: reword rebase summaryStefan Beller1-1/+1
2015-10-05Merge branch 'mm/keyid-docs'Junio C Hamano1-1/+3
2015-10-05Merge branch 'jk/rebase-no-autostash'Junio C Hamano1-1/+2
2015-09-21Documentation: explain optional arguments betterMatthieu Moy1-1/+3
2015-09-10Documentation/git-rebase: fix --no-autostash formattingJohn Keeping1-1/+2
2015-08-03Merge branch 'gr/rebase-i-drop-warn'Junio C Hamano1-0/+9
2015-06-30git rebase -i: warn about removed commitsGalan Rémi1-0/+6
2015-06-30git-rebase -i: add command "drop" to remove a commitGalan Rémi1-0/+3
2015-06-15git-rebase--interactive.sh: add config option for custom instruction formatMichael Rappazzo1-0/+7
2015-05-22Merge branch 'jk/asciidoc-markup-fix'Junio C Hamano1-1/+1
2015-05-12doc: fix misrendering due to `single quote'Jeff King1-1/+1
2015-03-31Sync with 2.3.5Junio C Hamano1-1/+3
2015-03-31Merge branch 'ss/pull-rebase-preserve' into maintJunio C Hamano1-1/+3
2015-03-30docs: clarify what git-rebase's "-p" / "--preserve-merges" doesSebastian Schuberth1-1/+3
2015-03-13*config.txt: stick to camelCase naming conventionNguyễn Thái Ngọc Duy1-3/+3
2014-10-14Merge branch 'so/rebase-doc-fork-point'Junio C Hamano1-12/+19
2014-09-29Documentation/git-rebase.txt: document when --fork-point is auto-enabledSergey Organov1-12/+19
2014-09-16Documentation/git-rebase.txt: <upstream> must be given to specify <branch>Sergey Organov1-1/+1
2014-08-12Documentation/git-rebase.txt: -f forces a rebase that would otherwise be a no-opSergey Organov1-5/+2
2014-02-11rebase: add the --gpg-sign optionNicolas Vigier1-0/+4
2013-12-10rebase: use reflog to find common base with upstreamJohn Keeping1-0/+10
2013-09-06Documentation: make AsciiDoc links always point to HTML filesSebastian Schuberth1-2/+2
2013-06-27rebase -i: handle fixup! fixup! in --autosquashAndrew Pimlott1-1/+3
2013-05-29rebase: implement --[no-]autostash and rebase.autostashRamkumar Ramachandra1-0/+10
2013-02-01Documentation: the name of the system is 'Git', not 'git'Thomas Ackermann1-1/+1
2012-09-17rebase -i: Teach "--edit-todo" actionAndrew Wong1-1/+4
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-07 00:05:48 +0000