summaryrefslogtreecommitdiff
path: root/Documentation/git-rebase.txt
AgeCommit message (Expand)AuthorFilesLines
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
2017-06-18stash: update documentation to use 'stash entry'Libravatar Liam Beguin1-1/+1
2017-04-26Merge branch 'gb/rebase-signoff'Libravatar Junio C Hamano1-0/+5
2017-04-18rebase: pass --[no-]signoff option to git amLibravatar Giuseppe Bilotta1-0/+5
2016-12-19Merge branch 'nd/rebase-forget'Libravatar Junio C Hamano1-1/+6
2016-12-11rebase: add --quit to cleanup rebase, leave everything else untouchedLibravatar Nguyễn Thái Ngọc Duy1-1/+6
2016-07-28Merge branch 'mm/doc-tt' into maintLibravatar Junio C Hamano1-5/+5
2016-07-13Merge branch 'mm/doc-tt'Libravatar Junio C Hamano1-5/+5
2016-06-28doc: typeset long command-line options as literalLibravatar Matthieu Moy1-5/+5
2016-03-18rebase: decouple --exec from --interactiveLibravatar Stefan Beller1-3/+3
2016-03-02Documentation: reword rebase summaryLibravatar Stefan Beller1-1/+1
2015-10-05Merge branch 'mm/keyid-docs'Libravatar Junio C Hamano1-1/+3
2015-10-05Merge branch 'jk/rebase-no-autostash'Libravatar Junio C Hamano1-1/+2
2015-09-21Documentation: explain optional arguments betterLibravatar Matthieu Moy1-1/+3
2015-09-10Documentation/git-rebase: fix --no-autostash formattingLibravatar John Keeping1-1/+2
2015-08-03Merge branch 'gr/rebase-i-drop-warn'Libravatar Junio C Hamano1-0/+9
2015-06-30git rebase -i: warn about removed commitsLibravatar Galan Rémi1-0/+6
2015-06-30git-rebase -i: add command "drop" to remove a commitLibravatar Galan Rémi1-0/+3
2015-06-15git-rebase--interactive.sh: add config option for custom instruction formatLibravatar Michael Rappazzo1-0/+7
2015-05-22Merge branch 'jk/asciidoc-markup-fix'Libravatar Junio C Hamano1-1/+1
2015-05-12doc: fix misrendering due to `single quote'Libravatar Jeff King1-1/+1
2015-03-31Sync with 2.3.5Libravatar Junio C Hamano1-1/+3
2015-03-31Merge branch 'ss/pull-rebase-preserve' into maintLibravatar Junio C Hamano1-1/+3
2015-03-30docs: clarify what git-rebase's "-p" / "--preserve-merges" doesLibravatar Sebastian Schuberth1-1/+3
2015-03-13*config.txt: stick to camelCase naming conventionLibravatar Nguyễn Thái Ngọc Duy1-3/+3
2014-10-14Merge branch 'so/rebase-doc-fork-point'Libravatar Junio C Hamano1-12/+19