summaryrefslogtreecommitdiff
path: root/Documentation/git-rebase.txt
Commit message (Expand)AuthorAgeFilesLines
* Documentation: stylistically normalize references to Signed-off-by:Bradley M. Kuhn2020-10-201-1/+1
* Merge branch 'pb/doc-sequence-editor-configuration'Junio C Hamano2020-09-031-0/+1
|\
| * doc: mention GIT_SEQUENCE_EDITOR and 'sequence.editor' morePhilippe Blain2020-08-311-0/+1
* | Merge branch 'pw/rebase-i-more-options'Junio C Hamano2020-09-031-6/+27
|\ \ | |/ |/|
| * rebase: add --reset-author-dateRohit Ashiwal2020-08-191-0/+1
| * rebase -i: support --ignore-datePhillip Wood2020-08-191-3/+4
| * rebase -i: support --committer-date-is-author-datePhillip Wood2020-08-171-3/+7
| * rebase -i: add --ignore-whitespace flagRohit Ashiwal2020-07-131-2/+17
* | Merge branch 'ma/rebase-doc-typofix' into masterJunio C Hamano2020-07-091-1/+1
|\ \
| * | git-rebase.txt: fix description list separatorMartin Ågren2020-07-091-1/+1
| |/
* | Doc: reference the "stash list" in autostash docsDenton Liu2020-05-051-1/+1
* | Merge branch 'en/rebase-root-and-fork-point-are-incompatible'Junio C Hamano2020-05-011-2/+5
|\ \
| * | rebase: display an error if --root and --fork-point are both providedElijah Newren2020-04-271-2/+5
| |/
* | Merge branch 'dl/merge-autostash-rebase-quit-fix'Junio C Hamano2020-04-291-1/+2
|\ \
| * | rebase: save autostash entry into stash reflog on --quitDenton Liu2020-04-281-1/+2
| |/
* | Merge branch 'en/rebase-doc-hooks-called-by-accident'Junio C Hamano2020-04-281-3/+11
|\ \
| * | git-rebase.txt: add another hook to the hooks section, and explain moreElijah Newren2020-04-051-3/+11
| |/
* | Merge branch 'jt/rebase-allow-duplicate'Junio C Hamano2020-04-221-2/+23
|\ \
| * | rebase --merge: optionally skip upstreamed commitsJonathan Tan2020-04-111-2/+23
* | | Merge branch 'en/rebase-no-keep-empty'Junio C Hamano2020-04-221-16/+31
|\ \ \ | |/ /
| * | rebase: reinstate --no-keep-emptyElijah Newren2020-04-111-17/+31
| * | rebase -i: mark commits that begin empty in todo editorElijah Newren2020-04-111-1/+2
| |/
* | Merge branch 'dd/no-gpg-sign'Junio C Hamano2020-04-221-1/+4
|\ \
| * | 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-281-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-161-36/+41
* rebase: change the default backend from "am" to "merge"Elijah Newren2020-02-161-1/+12
* rebase: add an --am optionElijah Newren2020-02-161-1/+10
* git-rebase.txt: add more details about behavioral differences of backendsElijah Newren2020-02-161-5/+80
* rebase (interactive-backend): fix handling of commits that become emptyElijah Newren2020-02-161-3/+26
* rebase (interactive-backend): make --keep-empty the defaultElijah Newren2020-02-161-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-271-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-091-1/+1
|\ \
| * | doc: promote "git switch"Nguyễn Thái Ngọc Duy2019-04-021-1/+1
View Lorry Controller Status