summaryrefslogtreecommitdiffstats
path: root/Documentation/git-rebase.txt (follow)
Commit message (Expand)AuthorAgeFilesLines
...
| * | rebase.c: honour --no-gpg-signĐoàn Trần Công Danh2020-04-031-1/+4
| |/
* | Merge branch 'pb/rebase-doc-typofix'Junio C Hamano2020-04-221-1/+1
|\ \ | |/ |/|
| * git-rebase.txt: fix typoPhilippe Blain2020-03-291-1/+1
* | git-rebase.txt: highlight backend differences with commit rewordingElijah Newren2020-03-111-0/+10
|/
* rebase: rename the two primary rebase backendsElijah Newren2020-02-171-36/+41
* rebase: change the default backend from "am" to "merge"Elijah Newren2020-02-171-1/+12
* rebase: add an --am optionElijah Newren2020-02-171-1/+10
* git-rebase.txt: add more details about behavioral differences of backendsElijah Newren2020-02-171-5/+80
* rebase (interactive-backend): fix handling of commits that become emptyElijah Newren2020-02-171-3/+26
* rebase (interactive-backend): make --keep-empty the defaultElijah Newren2020-02-171-11/+13
* git-rebase.txt: update description of --allow-empty-messageElijah Newren2020-01-171-3/+4
* Revert "Merge branch 'ra/rebase-i-more-options'"Junio C Hamano2020-01-121-21/+6
* Merge branch 'ra/rebase-i-more-options'Junio C Hamano2019-12-101-6/+21
|\
| * rebase -i: finishing touches to --reset-author-dateJunio C Hamano2019-11-251-2/+4
| * rebase: add --reset-author-dateRohit Ashiwal2019-11-021-0/+1
| * rebase -i: support --ignore-dateRohit Ashiwal2019-11-021-3/+3
| * rebase -i: support --committer-date-is-author-dateRohit Ashiwal2019-11-021-3/+7
| * rebase -i: add --ignore-whitespace flagRohit Ashiwal2019-11-021-2/+10
* | doc: improve readability of --rebase-merges in git-rebaseNaveen Nathan2019-11-121-2/+2
* | Merge branch 'dl/rebase-i-keep-base'Junio C Hamano2019-09-301-3/+27
|\ \
| * | rebase: teach rebase --keep-baseDenton Liu2019-08-281-3/+27
* | | Merge branch 'en/filter-branch-deprecation'Junio C Hamano2019-09-301-1/+2
|\ \ \
| * | | Recommend git-filter-repo instead of git-filter-branchElijah Newren2019-09-051-1/+2
| |/ /
* | | Merge branch 'js/rebase-r-strategy'Junio C Hamano2019-09-181-2/+0
|\ \ \ | |/ / |/| |
| * | rebase -r: support merge strategies other than `recursive`Johannes Schindelin2019-07-311-2/+0
| |/
* | Merge branch 'nd/switch-and-restore'Junio C Hamano2019-07-101-1/+1
|\ \
| * | doc: promote "git switch"Nguyễn Thái Ngọc Duy2019-04-021-1/+1
* | | Merge branch 'pw/doc-synopsis-markup-opmode-options'Junio C Hamano2019-07-101-1/+1
|\ \ \ | |_|/ |/| |
| * | show --continue/skip etc. consistently in synopsisPhillip Wood2019-06-181-1/+1
* | | Merge branch 'js/rebase-deprecate-preserve-merges'Junio C Hamano2019-05-301-2/+3
|\ \ \
| * | | rebase docs: recommend `-r` over `-p`Johannes Schindelin2019-05-281-2/+3
* | | | Merge branch 'pw/rerere-autoupdate'Junio C Hamano2019-04-161-0/+5
|\ \ \ \
| * | | | am/cherry-pick/rebase/revert: document --rerere-autoupdatePhillip Wood2019-03-181-0/+5
| | |_|/ | |/| |
* | | | Merge branch 'js/rebase-deprecate-preserve-merges'Junio C Hamano2019-04-091-11/+12
|\ \ \ \ | |/ / / |/| / / | |/ /
| * / rebase: deprecate --preserve-mergesJohannes Schindelin2019-03-121-11/+12
| |/
* | Merge branch 'js/rebase-recreate-merge'Junio C Hamano2019-03-111-1/+1
|\ \ | |/ |/|
| * rebase docs: fix "gitlink" typoKyle Meyer2019-03-011-1/+1
* | 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
| |/ /