summaryrefslogtreecommitdiff
path: root/Documentation/git-rebase.txt
AgeCommit message (Expand)AuthorFilesLines
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
2018-06-27git-rebase: make --allow-empty-message the defaultLibravatar Elijah Newren1-10/+0
2018-06-27git-rebase.txt: document behavioral differences between modesLibravatar Elijah Newren1-0/+32
2018-06-27git-rebase.txt: address confusion between --no-ff vs --force-rebaseLibravatar Elijah Newren1-20/+10
2018-06-27rebase: fix documentation formattingLibravatar Vladimir Parfinenko1-1/+1
2018-06-26git-rebase.txt: document incompatible optionsLibravatar Elijah Newren1-8/+77
2018-05-25Use proper syntax for replaceables in command docsLibravatar Robert P. J. Day1-2/+2
2018-04-26rebase -i --rebase-merges: add a section to the man pageLibravatar Johannes Schindelin1-0/+135
2018-04-26rebase -i: introduce --rebase-merges=[no-]rebase-cousinsLibravatar Johannes Schindelin1-4/+11
2018-04-26rebase: introduce the --rebase-merges optionLibravatar Johannes Schindelin1-1/+20
2018-04-25Merge branch 'pw/rebase-signoff'Libravatar Junio C Hamano1-3/+4
2018-03-29rebase: extend --signoff supportLibravatar Phillip Wood1-3/+4
2018-03-06Merge branch 'nd/rebase-show-current-patch'Libravatar Junio C Hamano1-1/+6
2018-02-12rebase: introduce and use pseudo-ref REBASE_HEADLibravatar Nguyễn Thái Ngọc Duy1-1/+2
2018-02-12rebase: add --show-current-patchLibravatar Nguyễn Thái Ngọc Duy1-1/+5
2018-02-07rebase: add --allow-empty-message optionLibravatar Genki Sky1-0/+5
2017-12-04Documentation: move rebase.* configs to new fileLibravatar Liam Beguin1-18/+1
2017-10-03Merge branch 'js/rebase-i-final'Libravatar Junio C Hamano1-7/+9
2017-08-23treewide: correct several "up-to-date" to "up to date"Libravatar Martin Ågren1-1/+1
2017-07-27rebase -i: rearrange fixup/squash lines using the rebase--helperLibravatar Johannes Schindelin1-7/+9
2017-07-12Merge branch 'ks/fix-rebase-doc-picture'Libravatar Junio C Hamano1-1/+1
2017-07-10doc: correct a mistake in an illustrationLibravatar Kaartic Sivaraam1-1/+1