summaryrefslogtreecommitdiff
path: root/Documentation/git-rebase.txt
AgeCommit message (Expand)AuthorFilesLines
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
2019-02-14Merge branch 'en/rebase-merge-on-sequencer'Libravatar Junio C Hamano1-2/+0
2019-02-14git-rebase.txt: update to reflect merge now implemented on sequencerLibravatar Elijah Newren1-2/+0
2019-02-14docs/git-rebase: remove redundant entry in incompatible options listLibravatar Emilio Cobos Álvarez1-1/+0
2019-02-08Merge branch 'js/rebase-i-redo-exec-fix'Libravatar Junio C Hamano1-6/+0
2019-02-06Merge branch 'en/rebase-merge-on-sequencer'Libravatar Junio C Hamano1-14/+3
2019-02-06Revert "rebase: introduce a shortcut for --reschedule-failed-exec"Libravatar Johannes Schindelin1-6/+0
2019-01-29Merge branch 'js/rebase-i-redo-exec'Libravatar Junio C Hamano1-0/+11
2019-01-14Merge branch 'en/directory-renames-nothanks-doc-update'Libravatar Junio C Hamano1-2/+3
2019-01-14Merge branch 'km/rebase-doc-typofix'Libravatar Junio C Hamano1-1/+1
2019-01-07rebase: implement --merge via the interactive machineryLibravatar Elijah Newren1-14/+3
2018-12-11rebase: introduce a shortcut for --reschedule-failed-execLibravatar Johannes Schindelin1-0/+6
2018-12-11rebase: introduce --reschedule-failed-execLibravatar Johannes Schindelin1-0/+5
2018-12-10rebase docs: drop stray word in merge command descriptionLibravatar Kyle Meyer1-1/+1
2018-12-09git-rebase.txt: update note about directory rename detection and amLibravatar Elijah Newren1-2/+3
2018-12-04Merge branch 'en/rebase-consistency'Libravatar Junio C Hamano1-13/+17
2018-12-04rebase docs: fix incorrect format of the section Behavioral DifferencesLibravatar Johannes Sixt1-13/+17
2018-11-13Merge branch 'nd/config-split'Libravatar Junio C Hamano1-1/+1
2018-11-02Merge branch 'js/rebase-i-break'Libravatar Junio C Hamano1-1/+5
2018-10-29config.txt: move rebase-config.txt to config/Libravatar Nguyễn Thái Ngọc Duy1-1/+1
2018-10-12rebase -i: introduce the 'break' commandLibravatar Johannes Schindelin1-0/+3
2018-10-11rebase -i: clarify what happens on a failed `exec`Libravatar Johannes Schindelin1-1/+2
2018-10-07docs: typo: s/isimilar/similar/Libravatar Michael Witten1-1/+1
2018-08-02Merge branch 'js/rebase-merge-octopus'Libravatar Junio C Hamano1-3/+4
2018-07-24Merge branch 'en/rebase-consistency'Libravatar Junio C Hamano1-27/+108
2018-07-18Merge branch 'js/rebase-recreate-merge'Libravatar Junio C Hamano1-1/+1
2018-07-11rebase --rebase-merges: adjust man page for octopus supportLibravatar Johannes Schindelin1-3/+4