summaryrefslogtreecommitdiffstats
path: root/Documentation/git-rebase.txt (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | Merge branch 'gb/rebase-signoff'Junio C Hamano2017-04-261-0/+5
|\ \ \
| * | | rebase: pass --[no-]signoff option to git amGiuseppe Bilotta2017-04-191-0/+5
* | | | Merge branch 'nd/rebase-forget'Junio C Hamano2016-12-191-1/+6
|\ \ \ \ | |/ / / |/| | |
| * | | rebase: add --quit to cleanup rebase, leave everything else untouchedNguyễn Thái Ngọc Duy2016-12-111-1/+6
* | | | Merge branch 'mm/doc-tt'Junio C Hamano2016-07-131-5/+5
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | doc: typeset long command-line options as literalMatthieu Moy2016-06-281-5/+5
| |/
* / rebase: decouple --exec from --interactiveStefan Beller2016-03-181-3/+3
|/
* Documentation: reword rebase summaryStefan Beller2016-03-031-1/+1
* Merge branch 'mm/keyid-docs'Junio C Hamano2015-10-051-1/+3
|\
| * Documentation: explain optional arguments betterMatthieu Moy2015-09-211-1/+3
* | Merge branch 'jk/rebase-no-autostash'Junio C Hamano2015-10-051-1/+2
|\ \
| * | Documentation/git-rebase: fix --no-autostash formattingJohn Keeping2015-09-111-1/+2
* | | Merge branch 'gr/rebase-i-drop-warn'Junio C Hamano2015-08-031-0/+9
|\ \ \
| * | | git rebase -i: warn about removed commitsGalan Rémi2015-06-301-0/+6
| * | | git-rebase -i: add command "drop" to remove a commitGalan Rémi2015-06-301-0/+3
| | |/ | |/|
* / | git-rebase--interactive.sh: add config option for custom instruction formatMichael Rappazzo2015-06-151-0/+7
|/ /
* | Merge branch 'jk/asciidoc-markup-fix'Junio C Hamano2015-05-221-1/+1
|\ \
| * | doc: fix misrendering due to `single quote'Jeff King2015-05-131-1/+1
* | | Sync with 2.3.5Junio C Hamano2015-03-311-1/+3
|\| |
| * | Merge branch 'ss/pull-rebase-preserve' into maintJunio C Hamano2015-03-311-1/+3
| |\ \ | | |/ | |/|
| | * docs: clarify what git-rebase's "-p" / "--preserve-merges" doesSebastian Schuberth2015-03-301-1/+3
* | | *config.txt: stick to camelCase naming conventionNguyễn Thái Ngọc Duy2015-03-141-3/+3
|/ /