summaryrefslogtreecommitdiff
path: root/Documentation/git-rebase.txt
AgeCommit message (Expand)AuthorFilesLines
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
2020-02-16rebase (interactive-backend): make --keep-empty the defaultLibravatar Elijah Newren1-11/+13
2020-01-17git-rebase.txt: update description of --allow-empty-messageLibravatar Elijah Newren1-3/+4
2020-01-12Revert "Merge branch 'ra/rebase-i-more-options'"Libravatar Junio C Hamano1-21/+6
2019-12-10Merge branch 'ra/rebase-i-more-options'Libravatar Junio C Hamano1-6/+21
2019-11-25rebase -i: finishing touches to --reset-author-dateLibravatar Junio C Hamano1-2/+4
2019-11-12doc: improve readability of --rebase-merges in git-rebaseLibravatar Naveen Nathan1-2/+2
2019-11-02rebase: add --reset-author-dateLibravatar Rohit Ashiwal1-0/+1
2019-11-02rebase -i: support --ignore-dateLibravatar Rohit Ashiwal1-3/+3
2019-11-02rebase -i: support --committer-date-is-author-dateLibravatar Rohit Ashiwal1-3/+7
2019-11-02rebase -i: add --ignore-whitespace flagLibravatar Rohit Ashiwal1-2/+10
2019-09-30Merge branch 'dl/rebase-i-keep-base'Libravatar Junio C Hamano1-3/+27
2019-09-30Merge branch 'en/filter-branch-deprecation'Libravatar Junio C Hamano1-1/+2
2019-09-18Merge branch 'js/rebase-r-strategy'Libravatar Junio C Hamano1-2/+0
2019-09-05Recommend git-filter-repo instead of git-filter-branchLibravatar Elijah Newren1-1/+2
2019-08-27rebase: teach rebase --keep-baseLibravatar Denton Liu1-3/+27
2019-07-31rebase -r: support merge strategies other than `recursive`Libravatar Johannes Schindelin1-2/+0
2019-07-09Merge branch 'nd/switch-and-restore'Libravatar Junio C Hamano1-1/+1
2019-07-09Merge branch 'pw/doc-synopsis-markup-opmode-options'Libravatar Junio C Hamano1-1/+1
2019-06-17show --continue/skip etc. consistently in synopsisLibravatar Phillip Wood1-1/+1
2019-05-30Merge branch 'js/rebase-deprecate-preserve-merges'Libravatar Junio C Hamano1-2/+3
2019-05-28rebase docs: recommend `-r` over `-p`Libravatar Johannes Schindelin1-2/+3
2019-04-16Merge branch 'pw/rerere-autoupdate'Libravatar Junio C Hamano1-0/+5
2019-04-10Merge branch 'js/rebase-deprecate-preserve-merges'Libravatar Junio C Hamano1-11/+12
2019-04-02doc: promote "git switch"Libravatar Nguyễn Thái Ngọc Duy1-1/+1
2019-03-18am/cherry-pick/rebase/revert: document --rerere-autoupdateLibravatar Phillip Wood1-0/+5
2019-03-12rebase: deprecate --preserve-mergesLibravatar Johannes Schindelin1-11/+12
2019-03-11Merge branch 'js/rebase-recreate-merge'Libravatar Junio C Hamano1-1/+1
2019-03-01rebase docs: fix "gitlink" typoLibravatar Kyle Meyer1-1/+1
2019-02-14Merge branch 'ea/rebase-compat-doc-fix'Libravatar Junio C Hamano1-1/+0