summaryrefslogtreecommitdiffstats
path: root/Documentation/git-rebase.txt (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ea/rebase-compat-doc-fix'Junio C Hamano2019-02-141-1/+0
|\
| * docs/git-rebase: remove redundant entry in incompatible options listEmilio Cobos Álvarez2019-02-141-1/+0
* | Merge branch 'en/rebase-merge-on-sequencer'Junio C Hamano2019-02-141-2/+0
|\ \
| * | git-rebase.txt: update to reflect merge now implemented on sequencerElijah Newren2019-02-141-2/+0
* | | Merge branch 'js/rebase-i-redo-exec-fix'Junio C Hamano2019-02-091-6/+0
|\ \ \
| * | | Revert "rebase: introduce a shortcut for --reschedule-failed-exec"Johannes Schindelin2019-02-061-6/+0
* | | | Merge branch 'en/rebase-merge-on-sequencer'Junio C Hamano2019-02-071-14/+3
|\ \ \ \ | | |/ / | |/| |
| * | | rebase: implement --merge via the interactive machineryElijah Newren2019-01-071-14/+3
| | |/ | |/|
* | | Merge branch 'js/rebase-i-redo-exec'Junio C Hamano2019-01-291-0/+11
|\ \ \ | | |/ | |/|
| * | rebase: introduce a shortcut for --reschedule-failed-execJohannes Schindelin2018-12-111-0/+6
| * | rebase: introduce --reschedule-failed-execJohannes Schindelin2018-12-111-0/+5
| |/
* | Merge branch 'en/directory-renames-nothanks-doc-update'Junio C Hamano2019-01-151-2/+3
|\ \
| * | git-rebase.txt: update note about directory rename detection and amElijah Newren2018-12-091-2/+3
| |/
* | Merge branch 'km/rebase-doc-typofix'Junio C Hamano2019-01-151-1/+1
|\ \ | |/ |/|
| * rebase docs: drop stray word in merge command descriptionKyle Meyer2018-12-101-1/+1
* | Merge branch 'en/rebase-consistency'Junio C Hamano2018-12-041-13/+17
|\ \
| * | rebase docs: fix incorrect format of the section Behavioral DifferencesJohannes Sixt2018-12-041-13/+17
* | | Merge branch 'nd/config-split'Junio C Hamano2018-11-131-1/+1
|\ \ \
| * | | config.txt: move rebase-config.txt to config/Nguyễn Thái Ngọc Duy2018-10-291-1/+1
| | |/ | |/|
* | | Merge branch 'js/rebase-i-break'Junio C Hamano2018-11-021-1/+5
|\ \ \ | |/ / |/| |
| * | rebase -i: introduce the 'break' commandJohannes Schindelin2018-10-121-0/+3
| * | rebase -i: clarify what happens on a failed `exec`Johannes Schindelin2018-10-111-1/+2
* | | docs: typo: s/isimilar/similar/Michael Witten2018-10-071-1/+1
* | | Merge branch 'js/rebase-merge-octopus'Junio C Hamano2018-08-031-3/+4
|\ \ \
| * | | rebase --rebase-merges: adjust man page for octopus supportJohannes Schindelin2018-07-111-3/+4
* | | | Merge branch 'en/rebase-consistency'Junio C Hamano2018-07-241-27/+108
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | git-rebase: make --allow-empty-message the defaultElijah Newren2018-06-271-10/+0
| * | git-rebase.txt: document behavioral differences between modesElijah Newren2018-06-271-0/+32
| * | git-rebase.txt: address confusion between --no-ff vs --force-rebaseElijah Newren2018-06-271-20/+10
| * | git-rebase.txt: document incompatible optionsElijah Newren2018-06-261-8/+77
| |/
* | Merge branch 'js/rebase-recreate-merge'Junio C Hamano2018-07-181-1/+1
|\ \ | |/ |/|
| * rebase: fix documentation formattingVladimir Parfinenko2018-06-271-1/+1
* | Use proper syntax for replaceables in command docsRobert P. J. Day2018-05-251-2/+2
|/
* rebase -i --rebase-merges: add a section to the man pageJohannes Schindelin2018-04-261-0/+135
* rebase -i: introduce --rebase-merges=[no-]rebase-cousinsJohannes Schindelin2018-04-261-4/+11
* rebase: introduce the --rebase-merges optionJohannes Schindelin2018-04-261-1/+20
* Merge branch 'pw/rebase-signoff'Junio C Hamano2018-04-251-3/+4
|\
| * rebase: extend --signoff supportPhillip Wood2018-03-291-3/+4
* | Merge branch 'nd/rebase-show-current-patch'Junio C Hamano2018-03-061-1/+6
|\ \
| * | rebase: introduce and use pseudo-ref REBASE_HEADNguyễn Thái Ngọc Duy2018-02-121-1/+2
| * | rebase: add --show-current-patchNguyễn Thái Ngọc Duy2018-02-121-1/+5
| |/
* / rebase: add --allow-empty-message optionGenki Sky2018-02-071-0/+5
|/
* Documentation: move rebase.* configs to new fileLiam Beguin2017-12-041-18/+1
* Merge branch 'js/rebase-i-final'Junio C Hamano2017-10-031-7/+9
|\
| * rebase -i: rearrange fixup/squash lines using the rebase--helperJohannes Schindelin2017-07-281-7/+9
* | treewide: correct several "up-to-date" to "up to date"Martin Ågren2017-08-231-1/+1
|/
* Merge branch 'ks/fix-rebase-doc-picture'Junio C Hamano2017-07-131-1/+1
|\
| * doc: correct a mistake in an illustrationKaartic Sivaraam2017-07-101-1/+1
| * Merge branch 'mm/doc-tt' into maintJunio C Hamano2016-07-281-5/+5
| |\
* | | stash: update documentation to use 'stash entry'Liam Beguin2017-06-191-1/+1
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-22 09:53:29 +0100